adding indices options schema

elastic · Mar 16, 2021 · 76a4479 · 76a4479
1 parent 8ca21bb
commit 76a4479
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts b/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts
@@ -13,6 +13,21 @@ export const startDatafeedSchema = schema.object({
   timeout: schema.maybe(schema.any()),
 });
 
+export const indicesOptionsSchema = schema.object({
+  expand_wildcards: schema.maybe(
+    schema.oneOf([
+      schema.literal('all'),
+      schema.literal('open'),
+      schema.literal('closed'),
+      schema.literal('hidden'),
+      schema.literal('none'),
+    ])
+  ),
+  ignore_unavailable: schema.maybe(schema.boolean()),
+  allow_no_indices: schema.maybe(schema.boolean()),
+  ignore_throttled: schema.maybe(schema.boolean()),
+});
+
 export const datafeedConfigSchema = schema.object({
   datafeed_id: schema.maybe(schema.string()),
   feed_id: schema.maybe(schema.string()),
@@ -35,14 +50,7 @@ export const datafeedConfigSchema = schema.object({
   runtime_mappings: schema.maybe(schema.any()),
   scroll_size: schema.maybe(schema.number()),
   delayed_data_check_config: schema.maybe(schema.any()),
-  indices_options: schema.maybe(
-    schema.object({
-      expand_wildcards: schema.maybe(schema.arrayOf(schema.string())),
-      ignore_unavailable: schema.maybe(schema.boolean()),
-      allow_no_indices: schema.maybe(schema.boolean()),
-      ignore_throttled: schema.maybe(schema.boolean()),
-    })
-  ),
+  indices_options: indicesOptionsSchema,
 });
 
 export const datafeedIdSchema = schema.object({ datafeedId: schema.string() });

diff --git a/x-pack/plugins/ml/server/routes/schemas/fields_service_schema.ts b/x-pack/plugins/ml/server/routes/schemas/fields_service_schema.ts
@@ -6,6 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { indicesOptionsSchema } from './datafeeds_schema';
 
 export const getCardinalityOfFieldsSchema = schema.object({
   /** Index or indexes for which to return the time range. */
@@ -30,5 +31,5 @@ export const getTimeFieldRangeSchema = schema.object({
   /** Query to match documents in the index(es). */
   query: schema.maybe(schema.any()),
   /** Additional search options. */
-  indicesOptions: schema.maybe(schema.any()),
+  indicesOptions: indicesOptionsSchema,
 });
diff --git a/x-pack/plugins/ml/server/routes/schemas/job_service_schema.ts b/x-pack/plugins/ml/server/routes/schemas/job_service_schema.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { anomalyDetectionJobSchema } from './anomaly_detectors_schema';
-import { datafeedConfigSchema } from './datafeeds_schema';
+import { datafeedConfigSchema, indicesOptionsSchema } from './datafeeds_schema';
 
 export const categorizationFieldExamplesSchema = {
   indexPatternTitle: schema.string(),
@@ -19,7 +19,7 @@ export const categorizationFieldExamplesSchema = {
   end: schema.number(),
   analyzer: schema.any(),
   runtimeMappings: schema.maybe(schema.any()),
-  indicesOptions: schema.maybe(schema.any()),
+  indicesOptions: indicesOptionsSchema,
 };
 
 export const chartSchema = {
@@ -33,7 +33,7 @@ export const chartSchema = {
   splitFieldName: schema.maybe(schema.nullable(schema.string())),
   splitFieldValue: schema.maybe(schema.nullable(schema.string())),
   runtimeMappings: schema.maybe(schema.any()),
-  indicesOptions: schema.maybe(schema.any()),
+  indicesOptions: indicesOptionsSchema,
 };
 
 export const datafeedIdsSchema = schema.object({

diff --git a/x-pack/plugins/ml/server/routes/schemas/job_validation_schema.ts b/x-pack/plugins/ml/server/routes/schemas/job_validation_schema.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { analysisConfigSchema, anomalyDetectionJobSchema } from './anomaly_detectors_schema';
-import { datafeedConfigSchema } from './datafeeds_schema';
+import { datafeedConfigSchema, indicesOptionsSchema } from './datafeeds_schema';
 
 export const estimateBucketSpanSchema = schema.object({
   aggTypes: schema.arrayOf(schema.nullable(schema.string())),
@@ -19,7 +19,7 @@ export const estimateBucketSpanSchema = schema.object({
   splitField: schema.maybe(schema.string()),
   timeField: schema.maybe(schema.string()),
   runtimeMappings: schema.maybe(schema.any()),
-  indicesOptions: schema.maybe(schema.any()),
+  indicesOptions: indicesOptionsSchema,
 });
 
 export const modelMemoryLimitSchema = schema.object({