Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kibanamachine merged 1 commit into from
Mar 16, 2021
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import type {
} from '../../../../../../src/plugins/data/server';
import {
LogSourceColumnConfiguration,
LogSourceConfigurationProperties,
logSourceFieldColumnConfigurationRT,
} from '../../../common/http_api/log_sources';
import {
Expand Down Expand Up @@ -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
),
Expand All @@ -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
)
);
Expand Down Expand Up @@ -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];
Expand Down