Apply KQL validation with leadingWildcard as true

elastic · Aug 9, 2024 · cf3e014 · cf3e014
1 parent dc8ee2f
commit cf3e014
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/...erver/integration_tests/__snapshots__/serverless_upgrade_and_rollback_checks.test.ts.snap b/...erver/integration_tests/__snapshots__/serverless_upgrade_and_rollback_checks.test.ts.snap
diff --git a/...on/observability/server/lib/rules/custom_threshold/register_custom_threshold_rule_type.ts b/...on/observability/server/lib/rules/custom_threshold/register_custom_threshold_rule_type.ts
@@ -36,7 +36,7 @@ import {
   valueActionVariableDescription,
   viewInAppUrlActionVariableDescription,
 } from './translations';
-import { oneOfLiterals } from './utils';
+import { oneOfLiterals, validateKQLStringFilter } from './utils';
 import {
   createCustomThresholdExecutor,
   CustomThresholdLocators,
@@ -57,11 +57,9 @@ export const searchConfigurationSchema = schema.object({
   index: schema.oneOf([schema.string(), dataViewSpecSchema]),
   query: schema.object({
     language: schema.string(),
-    query: schema.string(),
-    // TODO Enable KQL validation: https://github.com/elastic/kibana/issues/190029
-    // query: schema.string({
-    //   validate: validateKQLStringFilter,
-    // }),
+    query: schema.string({
+      validate: validateKQLStringFilter,
+    }),
   }),
   filter: schema.maybe(
     schema.arrayOf(
@@ -105,11 +103,9 @@ export function thresholdRuleType(
           name: schema.string(),
           aggType: schema.literal('count'),
           filter: schema.maybe(
-            schema.string()
-            // TODO Enable KQL validation: https://github.com/elastic/kibana/issues/190029
-            // schema.string({
-            //   validate: validateKQLStringFilter,
-            // })
+            schema.string({
+              validate: validateKQLStringFilter,
+            })
           ),
           field: schema.never(),
         }),

diff --git a/...k/plugins/observability_solution/observability/server/lib/rules/custom_threshold/utils.ts b/...k/plugins/observability_solution/observability/server/lib/rules/custom_threshold/utils.ts
@@ -52,7 +52,11 @@ export const validateKQLStringFilter = (value: string) => {
   }
 
   try {
-    kbnBuildEsQuery(undefined, [{ query: value, language: 'kuery' }], []);
+    kbnBuildEsQuery(undefined, [{ query: value, language: 'kuery' }], [], {
+      allowLeadingWildcards: true,
+      queryStringOptions: {},
+      ignoreFilterIfFieldNotInIndex: true,
+    });
   } catch (e) {
     return i18n.translate('xpack.observability.customThreshold.rule.schema.invalidFilterQuery', {
       defaultMessage: `filterQuery must be a valid KQL filter (error: ${e.message})`,