Use fields API in /item API

elastic · Sep 8, 2020 · 528c82a · 528c82a
1 parent 1c57b84
commit 528c82a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts
@@ -13,7 +13,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { map, fold } from 'fp-ts/lib/Either';
 import { identity, constant } from 'fp-ts/lib/function';
 import { RequestHandlerContext } from 'src/core/server';
-import { JsonObject, JsonValue } from '../../../../common/typed_json';
+import { JsonValue } from '../../../../common/typed_json';
 import {
   LogEntriesAdapter,
   LogEntriesParams,
@@ -31,7 +31,7 @@ const TIMESTAMP_FORMAT = 'epoch_millis';
 interface LogItemHit {
   _index: string;
   _id: string;
-  _source: JsonObject;
+  fields: { [key: string]: [value: unknown] };
   sort: [number, number];
 }
 
@@ -215,6 +215,8 @@ export class InfraKibanaLogEntriesAdapter implements LogEntriesAdapter {
             values: [id],
           },
         },
+        fields: ['*'],
+        _source: false,
       },
     };
 

diff --git a/...infra/server/lib/domains/log_entries_domain/convert_document_source_to_log_item_fields.ts b/...infra/server/lib/domains/log_entries_domain/convert_document_source_to_log_item_fields.ts
@@ -20,6 +20,11 @@ const serializeValue = (value: any): string => {
   }
   return `${value}`;
 };
+export const convertESFieldsToLogItemFields = (fields: {
+  [field: string]: [value: unknown];
+}): LogEntriesItemField[] => {
+  return Object.keys(fields).map((field) => ({ field, value: serializeValue(fields[field][0]) }));
+};
 
 export const convertDocumentSourceToLogItemFields = (
   source: JsonObject,

diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
@@ -22,7 +22,7 @@ import {
   SavedSourceConfigurationFieldColumnRuntimeType,
 } from '../../sources';
 import { getBuiltinRules } from './builtin_rules';
-import { convertDocumentSourceToLogItemFields } from './convert_document_source_to_log_item_fields';
+import { convertESFieldsToLogItemFields } from './convert_document_source_to_log_item_fields';
 import {
   CompiledLogMessageFormattingRule,
   Fields,
@@ -264,7 +264,7 @@ export class InfraLogEntriesDomain {
         tiebreaker: document.sort[1],
       },
       fields: sortBy(
-        [...defaultFields, ...convertDocumentSourceToLogItemFields(document._source)],
+        [...defaultFields, ...convertESFieldsToLogItemFields(document.fields)],
         'field'
       ),
     };
@@ -313,7 +313,7 @@ export class InfraLogEntriesDomain {
 interface LogItemHit {
   _index: string;
   _id: string;
-  _source: JsonObject;
+  fields: { [field: string]: [value: unknown] };
   sort: [number, number];
 }