Skip to content

Fix: align Alert Logs table with System Logs and Colourization from system logs tab #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheWitness merged 2 commits into from
Sep 21, 2026
+27 −21
Merged

Fix: align Alert Logs table with System Logs and Colourization from system logs tab #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23c29c4
fix: align Alert Logs table with System Logs and share Kiwi row tints
bmfmancini Sep 21, 2026
b6c1196
Merge branch 'develop' into FIX/alert-log-column-order-clean
bmfmancini Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion css/search.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,6 @@
#syslog_workspace tr.syslogRow.logNotice td:first-child { border-left-color: #3478b5; }
#syslog_workspace tr.syslogRow.logInfo td:first-child { border-left-color: #5b9b4b; }
#syslog_workspace tr.syslogRow.logDebug td:first-child { border-left-color: #8b9690; }
#syslog_workspace tr.syslogAlertRow td:first-child { border-left: 4px solid #c0392b; }
#syslog_workspace:is([data-theme='dark'], [data-theme='midwinter']) tr.syslogRow { --syslog-tint-even: #2b3530; --syslog-tint-hover: #34443a; }
#syslog_workspace:is([data-theme='dark'], [data-theme='midwinter']) tr.syslogRow.logEmergency { --syslog-tint: #5c2626; --syslog-tint-even: #552424; --syslog-tint-hover: #663030; }
#syslog_workspace:is([data-theme='dark'], [data-theme='midwinter']) tr.syslogRow.logAlert { --syslog-tint: #57302a; --syslog-tint-even: #502c27; --syslog-tint-hover: #613832; }
Expand Down
23 changes: 16 additions & 7 deletions functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2818,6 +2818,15 @@ function syslog_remove_items($table, $max_seq) {

/**
* Sets the CSS class for each alert log row of the syslog table as it is
* displayed. The classes reuse the same Kiwi-style pastel tints that the
* main syslog table applies per priority, so both tables share one look.
*
* @param mixed $severity The alert severity of the row.
* @param mixed $tip_title The row tooltip title (unused, kept for compatibility).
*
* @return void
*/
function syslog_log_row_color($severity, $tip_title): void {
* displayed. It supports both the legacy as well as the new approach to
* controlling these colors.
*
Expand Down Expand Up @@ -2845,7 +2854,7 @@ function syslog_log_row_color($severity, $tip_title): void {
break;
}

print "<tr class='tableRow selectable syslogAlertRow $class'>\n";
print "<tr class='tableRow selectable syslogRow $class'>\n";
}

/**
Expand Down Expand Up @@ -3141,7 +3150,7 @@ function syslog_export($tab) {
$sql_where = '';
$messages = get_syslog_messages($sql_where, 100000, $tab);

$line = ['name', 'severity', 'date', 'message', 'host', 'facility', 'priority', 'count'];
$line = ['date', 'device', 'severity', 'alertname', 'message', 'count', 'facility', 'priority'];

$fp = fopen('php://output', 'w');

Expand All @@ -3160,14 +3169,14 @@ function syslog_export($tab) {
}

$line = [
syslog_csv_safe($message['name']),
syslog_csv_safe($severity),
$message['logtime'],
syslog_csv_safe($message['logmsg']),
syslog_csv_safe($message['host']),
syslog_csv_safe($severity),
syslog_csv_safe($message['name']),
syslog_csv_safe($message['logmsg']),
$message['count'],
syslog_csv_safe(ucfirst($message['facility'])),
syslog_csv_safe(ucfirst($message['priority'])),
$message['count']
syslog_csv_safe(ucfirst($message['priority']))
];

fputcsv($fp, $line, ',', '"', '');
Expand Down
24 changes: 11 additions & 13 deletions syslog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,9 +1699,8 @@ function syslog_log_legend(): void {

html_start_box('', '100%', '', '3', 'center', '');
print '<tr class="">';
print "<td width='10%' class='logCritical'>" . __('Critical', 'syslog') . '</td>';
print "<td width='10%' class='logAlert'>" . __('Alert', 'syslog') . '</td>';
print "<td width='10%' class='logWarning'>" . __('Warning', 'syslog') . '</td>';
print "<td width='10%' class='logNotice'>" . __('Notice', 'syslog') . '</td>';
print "<td width='10%' class='logInfo'>" . __('Informational', 'syslog') . '</td>';
print '</tr>';
html_end_box(false);
Expand Down Expand Up @@ -1944,14 +1943,14 @@ function syslog_messages(string $tab = 'syslog'): void {
<?php
} else {
$display_text = [
'name' => ['display' => __('Alert Name', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'severity' => ['display' => __('Severity', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'logtime' => ['display' => __('Date', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'host' => ['display' => __('Device', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'severity' => ['display' => __('Severity', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'name' => ['display' => __('Alert Name', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'logmsg' => ['display' => __('Message', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'count' => ['display' => __('Count', 'syslog'), 'sort' => 'ASC', 'align' => 'right'],
'host' => ['display' => __('Device', 'syslog'), 'sort' => 'ASC', 'align' => 'right'],
'facility_id' => ['display' => __('Facility', 'syslog'), 'sort' => 'ASC', 'align' => 'right'],
'priority_id' => ['display' => __('Priority', 'syslog'), 'sort' => 'ASC', 'align' => 'right']
'facility_id' => ['display' => __('Facility', 'syslog'), 'sort' => 'ASC', 'align' => 'left'],
'priority_id' => ['display' => __('Priority', 'syslog'), 'sort' => 'ASC', 'align' => 'left']
];

$nav = html_nav_bar("syslog.php?tab=$tab", MAX_DISPLAY_PAGES, get_request_var_request('page'), $rows, $total_rows, cacti_sizeof($display_text), __('Alert Log Rows', 'syslog'), 'page', 'main');
Expand All @@ -1968,16 +1967,15 @@ function syslog_messages(string $tab = 'syslog'): void {

syslog_log_row_color($log['severity'], $title);

form_selectable_cell(filter_value($log['name'] != '' ? $log['name'] : __('Alert Removed', 'syslog'), get_request_var('rfilter'), $config['url_path'] . 'plugins/syslog/syslog.php?id=' . $log['seq'] . '&tab=current'), $log['seq'], '', 'left');

form_selectable_cell(isset($severities[$log['severity']]) ? $severities[$log['severity']] : __('Unknown', 'syslog'), $log['seq'], '', 'left');
form_selectable_cell($log['logtime'], $log['seq'], '', 'left');
print "<td class='nowrap left'>" . syslog_value_filter_button($log['host'], 'host') . '</td>';
form_selectable_cell(isset($severities[$log['severity']]) ? $severities[$log['severity']] : __('Unknown', 'syslog'), $log['seq'], '', 'left');
form_selectable_cell(filter_value($log['name'] != '' ? $log['name'] : __('Alert Removed', 'syslog'), get_request_var('rfilter'), $config['url_path'] . 'plugins/syslog/syslog.php?id=' . $log['seq'] . '&tab=current'), $log['seq'], '', 'left');
form_selectable_cell(syslog_message_button($log['logmsg'], $log['host'], $log['program'] ?? '', $log['facility'], $log['priority'], $log['logtime']), $log['seq'], '', 'syslogMessage left');

form_selectable_cell($log['count'], $log['seq'], '', 'right');
print "<td class='nowrap right'>" . syslog_value_filter_button($log['host'], 'host') . '</td>';
form_selectable_cell(ucfirst($log['facility']), $log['seq'], '', 'right');
print "<td class='nowrap right'>" . syslog_value_filter_button(ucfirst($log['priority']), 'priority') . '</td>';
form_selectable_cell(ucfirst($log['facility']), $log['seq'], '', 'left');
print "<td class='nowrap left'>" . syslog_value_filter_button(ucfirst($log['priority']), 'priority') . '</td>';

form_end_row();
}
Expand Down
Loading