IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: Fix log level color and add tests (#21646)

Browse Source
This commit is contained in:
Ivana Huckova 2020-01-21 17:20:22 +01:00 committed by GitHub
parent 92ef8644c5
commit 6feb4a3221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/grafana-data/src/utils/logs.test.ts
View File

@ -6,6 +6,7 @@ import {
getParser,
LogsParsers,
calculateStats,
getLogLevelFromKey,
} from './logs';
describe('getLoglevel()', () => {
@ -23,6 +24,10 @@ describe('getLoglevel()', () => {
expect(getLogLevel('[Warn]')).toBe('warning');
});
it('returns correct log level when level is capitalized', () => {
expect(getLogLevel('WARN')).toBe(LogLevel.warn);
});
it('returns log level on line contains a log level', () => {
expect(getLogLevel('warn: it is looking bad')).toBe(LogLevel.warn);
expect(getLogLevel('2007-12-12 12:12:12 [WARN]: it is looking bad')).toBe(LogLevel.warn);
@ -33,6 +38,15 @@ describe('getLoglevel()', () => {
});
});
describe('getLogLevelFromKey()', () => {
it('returns correct log level', () => {
expect(getLogLevelFromKey('info')).toBe(LogLevel.info);
});
it('returns correct log level when level is capitalized', () => {
expect(getLogLevelFromKey('INFO')).toBe(LogLevel.info);
});
});
describe('calculateLogsLabelStats()', () => {
test('should return no stats for empty rows', () => {
expect(calculateLogsLabelStats([], '')).toEqual([]);

2
packages/grafana-data/src/utils/logs.ts
View File

@ -33,7 +33,7 @@ export function getLogLevel(line: string): LogLevel {
}
export function getLogLevelFromKey(key: string): LogLevel {
const level = (LogLevel as any)[key];
const level = (LogLevel as any)[key.toLowerCase()];
if (level) {
return level;
}