Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTikhon Uskov <tikhon.uskov@zabbix.com>2021-04-26 14:16:36 +0300
committerTikhon Uskov <tikhon.uskov@zabbix.com>2021-04-26 14:16:36 +0300
commit0005ee56ca97c45c507446e297dd8e7ce1c6aa83 (patch)
tree6da56f08533f1c7ff65ff6e74d2fd1ff8c1ddd21 /templates
parent52e40f9da0a52747e58f26ef704b991e2fe339c5 (diff)
.........T [ZBXNEXT-6592] fixed recovery message
Diffstat (limited to 'templates')
-rw-r--r--templates/media/manageengine_servicedesk/media_manageengine_servicedesk.yaml15
1 files changed, 10 insertions, 5 deletions
diff --git a/templates/media/manageengine_servicedesk/media_manageengine_servicedesk.yaml b/templates/media/manageengine_servicedesk/media_manageengine_servicedesk.yaml
index 400ea77efc7..74a76316bd2 100644
--- a/templates/media/manageengine_servicedesk/media_manageengine_servicedesk.yaml
+++ b/templates/media/manageengine_servicedesk/media_manageengine_servicedesk.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '5.4'
- date: '2021-04-22T09:43:39Z'
+ date: '2021-04-26T11:14:16Z'
media_types:
-
name: 'ManageEngine ServiceDesk'
@@ -287,7 +287,10 @@ zabbix_export:
}
}
});
- data.description = data.description.replace(/(?:\r\n|\r|\n)/g, '<br>');
+ if (data.description) {
+ data.description = data.description.replace(/(?:\r\n|\r|\n)/g, '<br>');
+ }
+
result = {request: data};
}
@@ -383,9 +386,11 @@ zabbix_export:
}
// Update created issue for trigger-based event.
else {
- MEngine.request('post', 'requests/' + params.sd_request_id + '/notes',
- MEngine.createPaylaod(fields, params.event_update_status === '1')
- );
+ if (params.event_update_status === '1') {
+ MEngine.request('post', 'requests/' + params.sd_request_id + '/notes',
+ MEngine.createPaylaod(fields, true)
+ );
+ }
delete fields['field_string:description'];
MEngine.request('put', 'requests/' + params.sd_request_id, MEngine.createPaylaod(fields));
}