maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Logs UI] Style improvements for log stream search strategy (#94560)

Browse source
This commit is contained in:
Felix Stürmer 2021-03-16 13:29:29 +01:00 committed by GitHub
parent 73a73332eb
commit e830e077d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
View file

@ -20,7 +20,6 @@ import type {
} from '../../../../../../src/plugins/data/server';
import {
LogSourceColumnConfiguration,
LogSourceConfigurationProperties,
logSourceFieldColumnConfigurationRT,
} from '../../../common/http_api/log_sources';
import {
@ -107,7 +106,10 @@ export const logEntriesSearchStrategyProvider = ({
params.size + 1,
configuration.fields.timestamp,
configuration.fields.tiebreaker,
getRequiredFields(configuration, messageFormattingRules, params.columns),
getRequiredFields(
params.columns ?? configuration.logColumns,
messageFormattingRules
),
params.query,
params.highlightPhrase
),
@ -131,7 +133,7 @@ export const logEntriesSearchStrategyProvider = ({
.slice(0, request.params.size)
.map(
getLogEntryFromHit(
request.params.columns ? request.params.columns : configuration.logColumns,
request.params.columns ?? configuration.logColumns,
messageFormattingRules
)
);
@ -257,12 +259,9 @@ function getResponseCursors(entries: LogEntry[]) {
const VIEW_IN_CONTEXT_FIELDS = ['log.file.path', 'host.name', 'container.id'];
const getRequiredFields = (
configuration: LogSourceConfigurationProperties,
messageFormattingRules: CompiledLogMessageFormattingRule,
columnOverrides?: LogSourceColumnConfiguration[]
columns: LogSourceColumnConfiguration[],
messageFormattingRules: CompiledLogMessageFormattingRule
): string[] => {
const columns = columnOverrides ? columnOverrides : configuration.logColumns;
const fieldsFromColumns = columns.reduce<string[]>((accumulatedFields, logColumn) => {
if (logSourceFieldColumnConfigurationRT.is(logColumn)) {
return [...accumulatedFields, logColumn.fieldColumn.field];