[Security Solution] Add nested field inside of data provider (#93721)

* add nested field inside of dataprovider * make sure to get nested * fix elq server side * add mock for nested attributes * Add basic tests for nested fields query generation * Update snapshots and failing tests with nestedFields * fix nested date Co-authored-by: Kevin Qualters <[email protected]>
elastic · Mar 9, 2021 · af8d5eb · af8d5eb
1 parent 023d9a0
commit af8d5eb
Show file tree

Hide file tree

Showing 17 changed files with 478 additions and 11 deletions.
diff --git a/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts b/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
@@ -71,6 +71,12 @@ export interface BrowserField {
   name: string;
   searchable: boolean;
   type: string;
+  subType?: {
+    [key: string]: unknown;
+    nested?: {
+      path: string;
+    };
+  };
 }
 
 export type BrowserFields = Readonly<Record<string, Partial<BrowserField>>>;

diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -161,13 +161,9 @@ export const closeTimeline = () => {
 };
 
 export const createNewTimeline = () => {
-  cy.get(TIMELINE_SETTINGS_ICON)
-    .filter(':visible')
-    .click({ force: true })
-    .then(() => {
-      cy.get(CREATE_NEW_TIMELINE).should('be.visible');
-      cy.get(CREATE_NEW_TIMELINE).click();
-    });
+  cy.get(TIMELINE_SETTINGS_ICON).filter(':visible').click({ force: true });
+  cy.get(CREATE_NEW_TIMELINE).should('be.visible');
+  cy.get(CREATE_NEW_TIMELINE).click();
 };
 
 export const createNewTimelineTemplate = () => {

diff --git a/...lic/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap b/...lic/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
@@ -172,6 +172,18 @@ describe('QueryBar ', () => {
               searchable: true,
               type: 'string',
             },
+            {
+              aggregatable: false,
+              name: 'nestedField.firstAttributes',
+              searchable: true,
+              type: 'string',
+            },
+            {
+              aggregatable: false,
+              name: 'nestedField.secondAttributes',
+              searchable: true,
+              type: 'string',
+            },
           ],
           title: 'filebeat-*,auditbeat-*,packetbeat-*',
         },
@@ -183,6 +195,7 @@ describe('QueryBar ', () => {
         query: 'here: query',
       },
       refreshInterval: undefined,
+      savedQuery: undefined,
       showAutoRefreshOnly: false,
       showDatePicker: false,
       showFilterBar: true,

diff --git a/x-pack/plugins/security_solution/public/common/containers/source/mock.ts b/x-pack/plugins/security_solution/public/common/containers/source/mock.ts
@@ -294,6 +294,38 @@ export const mocksSource = {
       searchable: true,
       type: 'date',
     },
+    {
+      aggregatable: false,
+      category: 'nestedField',
+      description: '',
+      example: '',
+      format: '',
+      indexes: ['auditbeat', 'filebeat', 'packetbeat'],
+      name: 'nestedField.firstAttributes',
+      searchable: true,
+      type: 'string',
+      subType: {
+        nested: {
+          path: 'nestedField',
+        },
+      },
+    },
+    {
+      aggregatable: false,
+      category: 'nestedField',
+      description: '',
+      example: '',
+      format: '',
+      indexes: ['auditbeat', 'filebeat', 'packetbeat'],
+      name: 'nestedField.secondAttributes',
+      searchable: true,
+      type: 'string',
+      subType: {
+        nested: {
+          path: 'nestedField',
+        },
+      },
+    },
   ],
 };
 
@@ -646,6 +678,42 @@ export const mockBrowserFields: BrowserFields = {
       },
     },
   },
+  nestedField: {
+    fields: {
+      'nestedField.firstAttributes': {
+        aggregatable: false,
+        category: 'nestedField',
+        description: '',
+        example: '',
+        format: '',
+        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
+        name: 'nestedField.firstAttributes',
+        searchable: true,
+        type: 'string',
+        subType: {
+          nested: {
+            path: 'nestedField',
+          },
+        },
+      },
+      'nestedField.secondAttributes': {
+        aggregatable: false,
+        category: 'nestedField',
+        description: '',
+        example: '',
+        format: '',
+        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
+        name: 'nestedField.secondAttributes',
+        searchable: true,
+        type: 'string',
+        subType: {
+          nested: {
+            path: 'nestedField',
+          },
+        },
+      },
+    },
+  },
 };
 
 export const mockDocValueFields: DocValueFields[] = [

diff --git a/x-pack/plugins/security_solution/public/common/containers/sourcerer/index.tsx b/x-pack/plugins/security_solution/public/common/containers/sourcerer/index.tsx
@@ -104,7 +104,11 @@ export const useInitSourcerer = (
           selectedPatterns: [signalIndexName],
         })
       );
-    } else if (signalIndexNameSelector != null && initialTimelineSourcerer.current) {
+    } else if (
+      scopeId === SourcererScopeName.detections &&
+      signalIndexNameSelector != null &&
+      initialTimelineSourcerer.current
+    ) {
       initialDetectionSourcerer.current = false;
       dispatch(
         sourcererActions.setSelectedIndexPatterns({

diff --git a/x-pack/plugins/security_solution/public/common/mock/index_pattern.ts b/x-pack/plugins/security_solution/public/common/mock/index_pattern.ts
@@ -93,6 +93,18 @@ export const mockIndexPattern: IIndexPattern = {
       type: 'string',
       aggregatable: true,
     },
+    {
+      name: 'nestedField.firstAttributes',
+      searchable: true,
+      type: 'string',
+      aggregatable: false,
+    },
+    {
+      name: 'nestedField.secondAttributes',
+      searchable: true,
+      type: 'string',
+      aggregatable: false,
+    },
   ],
   title: 'filebeat-*,auditbeat-*,packetbeat-*',
 };

diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx
@@ -120,6 +120,18 @@ describe('body', () => {
             { name: 'agent.test7', searchable: true, type: 'string', aggregatable: true },
             { name: 'agent.test8', searchable: true, type: 'string', aggregatable: true },
             { name: 'host.name', searchable: true, type: 'string', aggregatable: true },
+            {
+              aggregatable: false,
+              name: 'nestedField.firstAttributes',
+              searchable: true,
+              type: 'string',
+            },
+            {
+              aggregatable: false,
+              name: 'nestedField.secondAttributes',
+              searchable: true,
+              type: 'string',
+            },
           ],
           title: 'filebeat-*,auditbeat-*,packetbeat-*',
         },

diff --git a/...n/public/network/components/network_top_countries_table/__snapshots__/index.test.tsx.snap b/...n/public/network/components/network_top_countries_table/__snapshots__/index.test.tsx.snap
diff --git a/...plugins/security_solution/public/timelines/components/edit_data_provider/helpers.test.tsx b/...plugins/security_solution/public/timelines/components/edit_data_provider/helpers.test.tsx
@@ -82,6 +82,17 @@ describe('helpers', () => {
           ],
         },
         { label: 'event', options: [{ label: 'event.end' }] },
+        {
+          label: 'nestedField',
+          options: [
+            {
+              label: 'nestedField.firstAttributes',
+            },
+            {
+              label: 'nestedField.secondAttributes',
+            },
+          ],
+        },
         { label: 'source', options: [{ label: 'source.ip' }, { label: 'source.port' }] },
       ]);
     });

diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/header.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/header.test.tsx
@@ -217,7 +217,7 @@ describe('Header', () => {
     );
 
     expect(wrapper.find('[data-test-subj="categories-count"]').first().text()).toEqual(
-      '9 categories'
+      '10 categories'
     );
   });
 
@@ -254,6 +254,6 @@ describe('Header', () => {
       </TestProviders>
     );
 
-    expect(wrapper.find('[data-test-subj="fields-count"]').first().text()).toEqual('25 fields');
+    expect(wrapper.find('[data-test-subj="fields-count"]').first().text()).toEqual('27 fields');
   });
 });
diff --git a/...ublic/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap b/...ublic/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap