diff --git a/packages/grafana-data/src/utils/logs.test.ts b/packages/grafana-data/src/utils/logs.test.ts index 9525b0e858e..944c51f11b2 100644 --- a/packages/grafana-data/src/utils/logs.test.ts +++ b/packages/grafana-data/src/utils/logs.test.ts @@ -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([]); diff --git a/packages/grafana-data/src/utils/logs.ts b/packages/grafana-data/src/utils/logs.ts index 03c00342f62..6889531b0ce 100644 --- a/packages/grafana-data/src/utils/logs.ts +++ b/packages/grafana-data/src/utils/logs.ts @@ -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; }