Revert "Siem query rule - reduce field_caps usage (#184890)" (#186181)

This reverts commit 257ef7f69e. ## Summary Summarize your PR. If it involves visual changes include a screenshot or gif. ### Checklist Delete any items that are not applicable to this PR. - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed - [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/)) - [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US)) - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)) - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers) ### Risk Matrix Delete this section if it is not applicable to this PR. Before closing this PR, invite QA, stakeholders, and other developers to identify risks that should be tested prior to the change/feature release. When forming the risk matrix, consider some of the following examples and how they may potentially impact the change: | Risk | Probability | Severity | Mitigation/Notes | |---------------------------|-------------|----------|-------------------------| | Multiple Spaces—unexpected behavior in non-default Kibana Space. | Low | High | Integration tests will verify that all features are still supported in non-default Kibana Space and when user switches between spaces. | | Multiple nodes—Elasticsearch polling might have race conditions when multiple Kibana nodes are polling for the same tasks. | High | Low | Tasks are idempotent, so executing them multiple times will not result in logical error, but will degrade performance. To test for this case we add plenty of unit tests around this logic and document manual testing procedure. | | Code should gracefully handle cases when feature X or plugin Y are disabled. | Medium | High | Unit tests will verify that any feature flag or plugin combination still results in our service operational. | | [See more potential risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) | ### For maintainers - [ ] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
2025-04-24 01:38:56 -04:00 · 2024-06-13 11:55:12 -04:00 · 2024-06-13 11:55:12 -04:00 · e66cedc17e
commit e66cedc17e
parent cf768dcb71
8 changed files with 41 additions and 152 deletions
--- a/src/plugins/data/common/search/search_source/index.ts
+++ b/src/plugins/data/common/search/search_source/index.ts
@ -15,4 +15,3 @@ export * from './fetch';
 export * from './search_source';
 export * from './search_source_service';
 export * from './types';
-export * from './query_to_fields';
--- a/src/plugins/data/common/search/search_source/query_to_fields.ts
+++ b/src/plugins/data/common/search/search_source/query_to_fields.ts
@ -1,58 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { DataViewLazy } from '@kbn/data-views-plugin/common';
-import { fromKueryExpression, getKqlFieldNames } from '@kbn/es-query';
-import type { SearchRequest } from './fetch';
-import { EsQuerySortValue } from '../..';
-
-export async function queryToFields({
-  dataView,
-  sort,
-  request,
-}: {
-  dataView: DataViewLazy;
-  sort?: EsQuerySortValue | EsQuerySortValue[];
-  request: SearchRequest;
-}) {
-  let fields = dataView.timeFieldName ? [dataView.timeFieldName] : [];
-  if (sort) {
-    const sortArr = Array.isArray(sort) ? sort : [sort];
-    fields.push(...sortArr.flatMap((s) => Object.keys(s)));
-  }
-  for (const query of request.query) {
-    if (query.query) {
-      const nodes = fromKueryExpression(query.query);
-      const queryFields = getKqlFieldNames(nodes);
-      fields = fields.concat(queryFields);
-    }
-  }
-  const filters = request.filters;
-  if (filters) {
-    const filtersArr = Array.isArray(filters) ? filters : [filters];
-    for (const f of filtersArr) {
-      // unified search bar filters have meta object and key (regular filters)
-      // unified search bar "custom" filters ("Edit as query DSL", where meta.key is not present but meta is)
-      // Any other Elasticsearch query DSL filter that gets passed in by consumers (not coming from unified search, and these probably won't have a meta key at all)
-      if (f?.meta?.key && f.meta.disabled !== true) {
-        fields.push(f.meta.key);
-      }
-    }
-  }
-
-  // if source filtering is enabled, we need to fetch all the fields
-  const fieldName =
-    dataView.getSourceFiltering() && dataView.getSourceFiltering().excludes.length ? ['*'] : fields;
-
-  if (fieldName.length) {
-    return (await dataView.getFields({ fieldName })).getFieldMapSorted();
-  }
-
-  // no fields needed to be loaded for query
-  return {};
-}
--- a/src/plugins/data/common/search/search_source/search_source.ts
+++ b/src/plugins/data/common/search/search_source/search_source.ts
@ -77,9 +77,11 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
  buildEsQuery,
  Filter,
+  fromKueryExpression,
  isOfQueryType,
  isPhraseFilter,
  isPhrasesFilter,
+  getKqlFieldNames,
 } from '@kbn/es-query';
 import { fieldWildcardFilter } from '@kbn/kibana-utils-plugin/common';
 import { getHighlightRequest } from '@kbn/field-formats-plugin/common';
@ -93,7 +95,6 @@ import type { ISearchGeneric, IKibanaSearchResponse, IEsSearchResponse } from '@
 import { normalizeSortRequest } from './normalize_sort_request';

 import { AggConfigSerialized, DataViewField, SerializedSearchSourceFields } from '../..';
-import { queryToFields } from './query_to_fields';

 import { AggConfigs, EsQuerySortValue } from '../..';
 import type {
@ -777,7 +778,43 @@ export class SearchSource {

  public async loadDataViewFields(dataView: DataViewLazy) {
    const request = this.mergeProps(this, { body: {} });
-    return await queryToFields({ dataView, request });
+    let fields = dataView.timeFieldName ? [dataView.timeFieldName] : [];
+    const sort = this.getField('sort');
+    if (sort) {
+      const sortArr = Array.isArray(sort) ? sort : [sort];
+      for (const s of sortArr) {
+        const keys = Object.keys(s);
+        fields = fields.concat(keys);
+      }
+    }
+    for (const query of request.query) {
+      if (query.query) {
+        const nodes = fromKueryExpression(query.query);
+        const queryFields = getKqlFieldNames(nodes);
+        fields = fields.concat(queryFields);
+      }
+    }
+    const filters = request.filters;
+    if (filters) {
+      const filtersArr = Array.isArray(filters) ? filters : [filters];
+      for (const f of filtersArr) {
+        fields = fields.concat(f.meta.key);
+      }
+    }
+    fields = fields.filter((f) => Boolean(f));
+
+    if (dataView.getSourceFiltering() && dataView.getSourceFiltering().excludes.length) {
+      // if source filtering is enabled, we need to fetch all the fields
+      return (await dataView.getFields({ fieldName: ['*'] })).getFieldMapSorted();
+    } else if (fields.length) {
+      return (
+        await dataView.getFields({
+          fieldName: fields,
+        })
+      ).getFieldMapSorted();
+    }
+    // no fields needed to be loaded for query
+    return {};
  }

  private flatten() {
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/mocks/rule_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/mocks/rule_type.ts
@ -104,14 +104,6 @@ export const createRuleTypeMocks = (
    alertWithPersistence: jest.fn(),
    logger: loggerMock,
    shouldWriteAlerts: () => true,
-    dataViews: {
-      createDataViewLazy: jest.fn().mockResolvedValue({
-        getFields: jest.fn().mockResolvedValue({
-          getFieldMapSorted: jest.fn().mockReturnValue({}),
-        }),
-        getSourceFiltering: jest.fn().mockReturnValue({ excludes: [] }),
-      }),
-    },
  };

  return {
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
@ -26,8 +26,6 @@ import {
  hasTimestampFields,
  isMachineLearningParams,
  isEsqlParams,
-  isQueryParams,
-  isEqlParams,
  getDisabledActionsWarningText,
 } from './utils/utils';
 import { DEFAULT_MAX_SIGNALS, DEFAULT_SEARCH_AFTER_PAGE_SIZE } from '../../../../common/constants';
@ -343,12 +341,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper =
            });
          }

-          if (
-            !isMachineLearningParams(params) &&
-            !isEsqlParams(params) &&
-            !isQueryParams(params) &&
-            !isEqlParams(params)
-          ) {
+          if (!isMachineLearningParams(params) && !isEsqlParams(params)) {
            inputIndexFields = await getFieldsForWildcard({
              index: inputIndex,
              dataViews: services.dataViews,
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/query.ts
@ -59,7 +59,6 @@ export const queryExecutor = async ({
      index: runOpts.inputIndex,
      exceptionFilter: runOpts.exceptionFilter,
      fields: runOpts.inputIndexFields,
-      loadFields: true,
    });

    const license = await firstValueFrom(licensing.license$);
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_filter.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_filter.ts
@ -26,8 +26,7 @@ import type { SavedIdOrUndefined } from '../../../../../common/api/detection_eng
 import type { PartialFilter } from '../../types';
 import { withSecuritySpan } from '../../../../utils/with_security_span';
 import type { ESBoolQuery } from '../../../../../common/typed_json';
-import { getQueryFilter as getQueryFilterNoLoadFields } from './get_query_filter';
-import { getQueryFilterLoadFields } from './get_query_filter_load_fields';
+import { getQueryFilter } from './get_query_filter';

 export interface GetFilterArgs {
  type: Type;
@ -39,7 +38,6 @@ export interface GetFilterArgs {
  index: IndexPatternArray | undefined;
  exceptionFilter: Filter | undefined;
  fields?: DataViewFieldBase[];
-  loadFields?: boolean;
 }

 interface QueryAttributes {
@ -61,11 +59,7 @@ export const getFilter = async ({
  query,
  exceptionFilter,
  fields = [],
-  loadFields = false,
 }: GetFilterArgs): Promise<ESBoolQuery> => {
-  const getQueryFilter = loadFields
-    ? getQueryFilterLoadFields(services.dataViews)
-    : getQueryFilterNoLoadFields;
  const queryFilter = () => {
    if (query != null && language != null && index != null) {
      return getQueryFilter({
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_query_filter_load_fields.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_query_filter_load_fields.ts
@ -1,67 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { Language } from '@kbn/securitysolution-io-ts-alerting-types';
-import type { Filter, EsQueryConfig, DataViewFieldBase } from '@kbn/es-query';
-import { DataView } from '@kbn/data-views-plugin/server';
-import { queryToFields } from '@kbn/data-plugin/common';
-import type { DataViewsContract } from '@kbn/data-views-plugin/common';
-import type { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
-import { buildEsQuery } from '@kbn/es-query';
-import type { ESBoolQuery } from '../../../../../common/typed_json';
-import { getAllFilters } from './get_query_filter';
-import type {
-  IndexPatternArray,
-  RuleQuery,
-} from '../../../../../common/api/detection_engine/model/rule_schema';
-
-export const getQueryFilterLoadFields =
-  (dataViewsService: DataViewsContract) =>
-  async ({
-    query,
-    language,
-    filters,
-    index,
-    exceptionFilter,
-  }: {
-    query: RuleQuery;
-    language: Language;
-    filters: unknown;
-    index: IndexPatternArray;
-    exceptionFilter: Filter | undefined;
-    fields?: DataViewFieldBase[];
-  }): Promise<ESBoolQuery> => {
-    const config: EsQueryConfig = {
-      allowLeadingWildcards: true,
-      queryStringOptions: { analyze_wildcard: true },
-      ignoreFilterIfFieldNotInIndex: false,
-      dateFormatTZ: 'Zulu',
-    };
-
-    const initialQuery = { query, language };
-    const allFilters = getAllFilters(filters as Filter[], exceptionFilter);
-
-    const title = (index ?? []).join();
-
-    const dataViewLazy = await dataViewsService.createDataViewLazy({ title });
-
-    const flds = await queryToFields({
-      dataView: dataViewLazy,
-      request: { query: [initialQuery], filters: allFilters },
-    });
-
-    const dataViewLimitedFields = new DataView({
-      spec: { title },
-      fieldFormats: {} as unknown as FieldFormatsStartCommon,
-      shortDotsEnable: false,
-      metaFields: [],
-    });
-
-    dataViewLimitedFields.fields.replaceAll(Object.values(flds).map((fld) => fld.toSpec()));
-
-    return buildEsQuery(dataViewLimitedFields, initialQuery, allFilters, config);
-  };