diff options
| author | Janis Freibergs <janis.freibergs@zabbix.com> | 2021-08-12 14:55:21 +0300 |
|---|---|---|
| committer | Janis Freibergs <janis.freibergs@zabbix.com> | 2021-08-12 15:02:34 +0300 |
| commit | b71ec8ecd91ccf369f79cc9994a31a6051ee64e9 (patch) | |
| tree | 5d8c5c3cb89b49b2edbc7ee2744217cf69336bbe /ui/app/views/monitoring.widget.actionlog.view.php | |
| parent | 3a4c43b286f413a76b17fe7ff5bd0ea38a2d7822 (diff) | |
..F....... [ZBX-19439] fixed Action log dashboard widget missing Remote command entries
* commit '02213874d0f4da68364ecf835c63cef63e659841':
..F....... [ZBX-19439] fixed Action log dashboard widget missing remote command entries
(cherry picked from commit 688c30d4853550e9ea286780e304f20116e855b4)
(cherry picked from commit 5e6324a8a5ad1492bb1a54c916842ad4453a5fe2)
Diffstat (limited to 'ui/app/views/monitoring.widget.actionlog.view.php')
| -rw-r--r-- | ui/app/views/monitoring.widget.actionlog.view.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ui/app/views/monitoring.widget.actionlog.view.php b/ui/app/views/monitoring.widget.actionlog.view.php index 2a33b6c79f7..349e1c65856 100644 --- a/ui/app/views/monitoring.widget.actionlog.view.php +++ b/ui/app/views/monitoring.widget.actionlog.view.php @@ -53,12 +53,23 @@ foreach ($data['alerts'] as $alert) { $info_icons = null; } + $message = ($alert['alerttype'] == ALERT_TYPE_MESSAGE) + ? [ + bold($alert['subject']), + BR(), + BR(), + zbx_nl2br($alert['message']) + ] + : [ + zbx_nl2br($alert['message']) + ]; + $table->addRow([ zbx_date2str(DATE_TIME_FORMAT_SECONDS, $alert['clock']), array_key_exists($alert['actionid'], $data['actions']) ? $data['actions'][$alert['actionid']]['name'] : '', $alert['description'], makeEventDetailsTableUser($alert, $data['db_users']), - [bold($alert['subject']), BR(), BR(), zbx_nl2br($alert['message'])], + $message, makeActionTableStatus($alert), makeInformationList($info_icons) ]); |