From 17192836ac4b39783c44e9b21120eeeff1d77581 Mon Sep 17 00:00:00 2001 From: Robert Stelmach <60304951+rStelmach@users.noreply.github.com> Date: Mon, 10 Mar 2025 13:55:35 +0100 Subject: [PATCH 1/3] [Discover] Exclude Elasticsearch metadata fields from Display in Content Column (#213255) Removed "_" from fields to exclude in the Display and replaced it with Elasticsearch's metadata fields. (cherry picked from commit 49ebf9e43e7848666fe720afd4365385aee7628e) # Conflicts: # src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx --- .../logs/components/summary_column/utils.tsx | 17 +++++++++++++++-- .../src/data_types/logs/constants.ts | 13 ++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx b/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx index 7dacc3393763e..ac75aa61f9ed0 100644 --- a/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx +++ b/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx @@ -25,6 +25,13 @@ import { ORCHESTRATOR_NAMESPACE_FIELD, ORCHESTRATOR_RESOURCE_ID_FIELD, SERVICE_NAME_FIELD, + SPAN_DURATION_FIELD, + TRANSACTION_DURATION_FIELD, + DataTableRecord, + getFieldValue, + INDEX_FIELD, + FILTER_OUT_EXACT_FIELDS_FOR_CONTENT, + TRANSACTION_NAME_FIELD, } from '@kbn/discover-utils'; import { DataTableRecord, getFieldValue } from '@kbn/discover-utils'; import { LogDocument, ResourceFields, getAvailableResourceFields } from '@kbn/discover-utils/src'; @@ -143,5 +150,11 @@ export const formatJsonDocumentForContent = (row: DataTableRecord) => { }; }; -const isFieldAllowed = (field: string) => - !FILTER_OUT_FIELDS_PREFIXES_FOR_CONTENT.some((prefix) => field.startsWith(prefix)); +export const isFieldAllowed = (field: string): boolean => { + const isExactMatchExcluded = FILTER_OUT_EXACT_FIELDS_FOR_CONTENT.includes(field); + const isPrefixMatchExcluded = FILTER_OUT_FIELDS_PREFIXES_FOR_CONTENT.some((prefix) => + field.startsWith(prefix) + ); + + return !isExactMatchExcluded && !isPrefixMatchExcluded; +}; diff --git a/src/platform/packages/shared/kbn-discover-utils/src/data_types/logs/constants.ts b/src/platform/packages/shared/kbn-discover-utils/src/data_types/logs/constants.ts index 82edebaff0e81..d61e3f4fea35f 100644 --- a/src/platform/packages/shared/kbn-discover-utils/src/data_types/logs/constants.ts +++ b/src/platform/packages/shared/kbn-discover-utils/src/data_types/logs/constants.ts @@ -47,7 +47,6 @@ export const DEFAULT_ROWS_PER_PAGE = 100; // List of prefixes which needs to be filtered out for Display in Content Column export const FILTER_OUT_FIELDS_PREFIXES_FOR_CONTENT = [ - '_', // Filter fields like '_id', '_score' '@timestamp', 'agent.', 'elastic_agent.', @@ -61,6 +60,18 @@ export const FILTER_OUT_FIELDS_PREFIXES_FOR_CONTENT = [ 'log.', 'service.', ]; +export const FILTER_OUT_EXACT_FIELDS_FOR_CONTENT = [ + '_id', + '_index', + '_source', + '_size', + '_doc_count', + '_field_names', + '_ignored', + '_routing', + '_meta', + '_tier', +]; export const DEFAULT_ALLOWED_DATA_VIEWS = ['logs', 'auditbeat', 'filebeat', 'winlogbeat']; export const DEFAULT_ALLOWED_LOGS_DATA_VIEWS = ['logs', 'auditbeat', 'filebeat', 'winlogbeat']; From 813c989ff71add98272fdffb8564aadf41745c42 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Wed, 19 Mar 2025 11:21:44 +0000 Subject: [PATCH 2/3] [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' --- .../src/data_types/logs/components/summary_column/utils.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx b/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx index ac75aa61f9ed0..edfc58bd531bf 100644 --- a/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx +++ b/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx @@ -25,13 +25,9 @@ import { ORCHESTRATOR_NAMESPACE_FIELD, ORCHESTRATOR_RESOURCE_ID_FIELD, SERVICE_NAME_FIELD, - SPAN_DURATION_FIELD, - TRANSACTION_DURATION_FIELD, DataTableRecord, getFieldValue, - INDEX_FIELD, FILTER_OUT_EXACT_FIELDS_FOR_CONTENT, - TRANSACTION_NAME_FIELD, } from '@kbn/discover-utils'; import { DataTableRecord, getFieldValue } from '@kbn/discover-utils'; import { LogDocument, ResourceFields, getAvailableResourceFields } from '@kbn/discover-utils/src'; From 2b207e7eeb3050f930b7b5da2c46b2c44b7e67c6 Mon Sep 17 00:00:00 2001 From: Robert Stelmach Date: Fri, 21 Mar 2025 12:43:17 +0100 Subject: [PATCH 3/3] doubled import --- .../src/data_types/logs/components/summary_column/utils.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx b/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx index edfc58bd531bf..70d9b0d461ef7 100644 --- a/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx +++ b/src/platform/packages/shared/kbn-discover-contextual-components/src/data_types/logs/components/summary_column/utils.tsx @@ -29,7 +29,6 @@ import { getFieldValue, FILTER_OUT_EXACT_FIELDS_FOR_CONTENT, } from '@kbn/discover-utils'; -import { DataTableRecord, getFieldValue } from '@kbn/discover-utils'; import { LogDocument, ResourceFields, getAvailableResourceFields } from '@kbn/discover-utils/src'; import { FieldBadgeWithActions, FieldBadgeWithActionsProps } from '../cell_actions_popover'; import { ServiceNameBadgeWithActions } from '../service_name_badge_with_actions';