From f37814f3b1d8e9bc549205502ce0a2120f81250e Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Mon, 20 Apr 2020 13:50:14 +0200 Subject: [PATCH] Fix getLogLevelFromKey when non-string supplied (#23654) --- packages/grafana-data/src/utils/logs.test.ts | 3 +++ packages/grafana-data/src/utils/logs.ts | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/grafana-data/src/utils/logs.test.ts b/packages/grafana-data/src/utils/logs.test.ts index 42fe2c36dc8..3eb86f61de4 100644 --- a/packages/grafana-data/src/utils/logs.test.ts +++ b/packages/grafana-data/src/utils/logs.test.ts @@ -46,6 +46,9 @@ describe('getLogLevelFromKey()', () => { it('returns correct log level when level is capitalized', () => { expect(getLogLevelFromKey('INFO')).toBe(LogLevel.info); }); + it('returns unknown log level when level is integer', () => { + expect(getLogLevelFromKey(1)).toBe(LogLevel.unknown); + }); }); describe('calculateLogsLabelStats()', () => { diff --git a/packages/grafana-data/src/utils/logs.ts b/packages/grafana-data/src/utils/logs.ts index 2915c4a5567..3749815efd0 100644 --- a/packages/grafana-data/src/utils/logs.ts +++ b/packages/grafana-data/src/utils/logs.ts @@ -37,8 +37,8 @@ export function getLogLevel(line: string): LogLevel { return level; } -export function getLogLevelFromKey(key: string): LogLevel { - const level = (LogLevel as any)[key.toLowerCase()]; +export function getLogLevelFromKey(key: string | number): LogLevel { + const level = (LogLevel as any)[key.toString().toLowerCase()]; if (level) { return level; }