From 29943f16027df999fafc984836fb2dc88bc09814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= Date: Fri, 10 Sep 2021 10:34:54 +0200 Subject: [PATCH 1/2] Ensure logs volume bar colors match legend colors --- public/app/core/logs_model.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts index 34386bb2003a..4d29360f66d0 100644 --- a/public/app/core/logs_model.ts +++ b/public/app/core/logs_model.ts @@ -10,6 +10,7 @@ import { dateTimeFormat, dateTimeFormatTimeAgo, FieldCache, + FieldColorModeId, FieldType, FieldWithIndex, findCommonLabels, @@ -143,6 +144,10 @@ export function makeDataFramesForLogs(sortedRows: LogRowModel[], bucketSize: num data.fields[valueField.index].config.min = 0; data.fields[valueField.index].config.decimals = 0; + data.fields[valueField.index].config.color = { + mode: FieldColorModeId.Fixed, + fixedColor: series.color, + }; data.fields[valueField.index].config.custom = { drawStyle: GraphDrawStyle.Bars, From 8e8fb6a5a79d033166e64c359258b94288ae1f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= Date: Fri, 10 Sep 2021 11:40:40 +0200 Subject: [PATCH 2/2] Fix tests --- public/app/features/explore/utils/decorators.test.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/app/features/explore/utils/decorators.test.ts b/public/app/features/explore/utils/decorators.test.ts index 9a89255baa96..ffc6abcc7753 100644 --- a/public/app/features/explore/utils/decorators.test.ts +++ b/public/app/features/explore/utils/decorators.test.ts @@ -4,6 +4,7 @@ import { ArrayVector, DataFrame, DataQueryRequest, + FieldColorModeId, FieldType, LoadingState, PanelData, @@ -361,6 +362,10 @@ describe('decorateWithLogsResult', () => { labels: undefined, values: new ArrayVector([3]), config: { + color: { + fixedColor: '#8e8e8e', + mode: FieldColorModeId.Fixed, + }, min: 0, decimals: 0, unit: undefined,