openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-26 17:46:19 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-mod-status: add log filtering to syslog tab

Browse Source 
Facility and severity filtering are based on a simple includes() search.
As such, false positives are possible. Although for the majority of
cases, this is still useful. Filtering using logread -z/Z is possible,
but not if a static log-file is configured. logread does not yet handle
severity either. 'not' checkboxes for each invert the respective search
filter.

A raw-text filter is also included as a bonus, whose meaning can be
inverted via the 'not' checkbox.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 16beffda15)
This commit is contained in:
Paul Donald
2025-04-19 20:45:11 +02:00
parent fe30872635
commit 7aa39de9fe
1 changed files with 179 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
View File

@@ -2,21 +2,103 @@
'require view';
'require fs';
'require poll';
'require uci';
'require ui';
return view.extend({
logFacilityFilter: 'any',
invertLogFacilitySearch: false,
logSeverityFilter: 'any',
invertLogseveritySearch: false,
logTextFilter: '',
invertLogTextSearch: false,
facilities: [
['any', '', _('Any')],
['0', 'kern', _('Kernel')],
['1', 'user', _('User')],
['2', 'mail', _('Mail')],
['3', 'daemon', _('Daemon')],
['4', 'auth', _('Auth')],
['5', 'syslog', _('Syslog')],
['6', 'lpr', _('LPR')],
['7', 'news', _('News')],
['8', 'uucp', _('UUCP')],
['9', 'cron', _('Cron')],
['10', 'authpriv', _('Auth Priv')],
['11', 'ftp', _('FTP')],
['12', 'ntp', _('NTP')],
['13', 'security', _('Log audit')],
['14', 'console', _('Log alert')],
['15', 'cron', _('Scheduling daemon')],
['16', 'local0', _('Local 0')],
['17', 'local1', _('Local 1')],
['18', 'local2', _('Local 2')],
['19', 'local3', _('Local 3')],
['20', 'local4', _('Local 4')],
['21', 'local5', _('Local 5')],
['22', 'local6', _('Local 6')],
['23', 'local7', _('Local 7')]
],
severity: [
['any', '', _('Any')],
['0', 'emerg', _('Emergency')],
['1', 'alert', _('Alert')],
['2', 'crit', _('Critical')],
['3', 'err', _('Error')],
['4', 'warning', _('Warning')],
['5', 'notice', _('Notice')],
['6', 'info', _('Info')],
['7', 'debug', _('Debug')]
],
retrieveLog: async function() {
const facility = this.logFacilityFilter;
return Promise.all([
L.resolveDefault(fs.stat('/usr/libexec/syslog-wrapper'), null)
]).then(function(stat) {
var logger = stat[0].path;
L.resolveDefault(fs.stat('/usr/libexec/syslog-wrapper'), null),
]).then((stat) => {
const logger = stat[0]?.path;
return fs.exec_direct(logger).then(logdata => {
const loglines = logdata.trim().split(/\n/);
return { value: loglines.join('\n'), rows: loglines.length + 1 };
let loglines = logdata.trim().split(/\n/);
// Filter by facility, and additionally severity string if selected
if (this.logSeverityFilter !== 'any') {
const sev = this.logSeverityFilter?.toLowerCase?.();
const fac = this.logFacilityFilter === 'any'
? this.facilities.map(f => f[1]) // all facility short names
: [ this.facilities.find(f => f[0] === this.logFacilityFilter)?.[1] ];
loglines = loglines.filter(line => {
const sevMatch = this.logSeverityFilter === 'any' || fac.some(facility => line.includes(`.${sev}`));
const facMatch = this.logFacilityFilter === 'any' || fac.some(facility => line.includes(`${facility}.`));
const finalMatch = (this.invertLogseveritySearch ? !sevMatch : sevMatch)
&& (this.invertLogFacilitySearch ? !facMatch : facMatch);
return finalMatch;
});
}
loglines = loglines.filter(line => {
const match = line.includes(this.logTextFilter);
return this.invertLogTextSearch ? !match : match;
});
return {
value: loglines.join('\n'),
rows: loglines.length + 1
};
}).catch(function(err) {
ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message)));
return '';
return {
value: '',
rows: 0
};
});
});
},
@@ -36,27 +118,111 @@ return view.extend({
},
render: function(loglines) {
var scrollDownButton = E('button', {
const scrollDownButton = E('button', {
'id': 'scrollDownButton',
'class': 'cbi-button cbi-button-neutral'
}, _('Scroll to tail', 'scroll to bottom (the tail) of the log file')
);
scrollDownButton.addEventListener('click', function() {
scrollUpButton.scrollIntoView();
});
scrollDownButton.addEventListener('click', () => scrollUpButton.scrollIntoView());
var scrollUpButton = E('button', {
const scrollUpButton = E('button', {
'id' : 'scrollUpButton',
'class': 'cbi-button cbi-button-neutral'
}, _('Scroll to head', 'scroll to top (the head) of the log file')
);
scrollUpButton.addEventListener('click', function() {
scrollDownButton.scrollIntoView();
scrollUpButton.addEventListener('click', () => scrollDownButton.scrollIntoView());
const self = this;
const log_file = uci.get_first('system', 'system', 'log_file');
// Create facility invert checkbox
const facilityInvert = E('input', {
'id': 'invertLogFacilitySearch',
'type': 'checkbox',
'class': 'cbi-input-checkbox',
});
// Create facility select-dropdown from facilities map
const facilitySelect = E('select', {
'id': 'logFacilitySelect',
'class': 'cbi-input-select',
'style': 'margin-bottom:10px',
},
this.facilities.map(([val, _, label]) =>
E('option', { value: val }, label)
));
// Create severity invert checkbox
const severityInvert = E('input', {
'id': 'invertLogseveritySearch',
'type': 'checkbox',
'class': 'cbi-input-checkbox',
});
// Create severity select-dropdown from facilities map
const severitySelect = E('select', {
'id': 'logSeveritySelect',
'class': 'cbi-input-select',
},
this.severity.map(([_, val, label]) =>
E('option', { value: val }, label)
));
// Create raw text search invert checkbox
const filterTextInvert = E('input', {
'id': 'invertLogTextSearch',
'type': 'checkbox',
'class': 'cbi-input-checkbox',
});
// Create raw text search text input
const filterTextInput = E('input', {
'id': 'logTextFilter',
'class': 'cbi-input-text',
});
function handleLogFilterChange() {
self.logFacilityFilter = facilitySelect.value;
self.invertLogFacilitySearch = facilityInvert.checked;
self.logSeverityFilter = severitySelect.value;
self.invertLogseveritySearch = severityInvert.checked;
self.logTextFilter = filterTextInput.value;
self.invertLogTextSearch = filterTextInvert.checked;
self.retrieveLog().then(log => {
const element = document.getElementById('syslog');
if (element) {
element.value = log.value;
element.rows = log.rows;
}
});
}
facilitySelect.addEventListener('change', handleLogFilterChange);
facilityInvert.addEventListener('change', handleLogFilterChange);
severitySelect.addEventListener('change', handleLogFilterChange);
severityInvert.addEventListener('change', handleLogFilterChange);
filterTextInput.addEventListener('input', handleLogFilterChange);
filterTextInvert.addEventListener('change', handleLogFilterChange);
return E([], [
E('h2', {}, [ _('System Log') ]),
E('div', { 'id': 'content_syslog' }, [
E('div', { 'style': 'margin-bottom:10px' }, [
E('label', { 'for': 'invertLogFacilitySearch', 'style': 'margin-right:5px' }, _('Not')),
facilityInvert,
E('label', { 'for': 'logFacilitySelect', 'style': 'margin: 0 5px' }, _('facility:')),
facilitySelect,
E('label', { 'for': 'invertLogseveritySearch', 'style': 'margin: 0 5px' }, _('Not')),
severityInvert,
E('label', { 'for': 'logSeveritySelect', 'style': 'margin: 0 5px' }, _('severity:')),
severitySelect,
]),
E('div', { 'style': 'margin-bottom:10px' }, [
E('label', { 'for': 'invertLogTextSearch', 'style': 'margin-right:5px' }, _('Not')),
filterTextInvert,
E('label', { 'for': 'logTextFilter', 'style': 'margin: 0 5px' }, _('including:')),
filterTextInput,
]),
E('div', {'style': 'padding-bottom: 20px'}, [scrollDownButton]),
E('textarea', {
'id': 'syslog',