diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
index 7be45c6c173b..706408f81f02 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
@@ -30,7 +30,7 @@ export interface SavedObjectsFindOptions
| [searchAfter](./kibana-plugin-core-public.savedobjectsfindoptions.searchafter.md) | estypes.Id[] | Use the sort values from the previous page to retrieve the next page of results. |
| [searchFields](./kibana-plugin-core-public.savedobjectsfindoptions.searchfields.md) | string[] | The fields to perform the parsed query against. See Elasticsearch Simple Query String fields argument for more information |
| [sortField](./kibana-plugin-core-public.savedobjectsfindoptions.sortfield.md) | string | |
-| [sortOrder](./kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md) | estypes.SortOrder | |
+| [sortOrder](./kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md) | estypes.SearchSortOrder | |
| [type](./kibana-plugin-core-public.savedobjectsfindoptions.type.md) | string | string[] | |
| [typeToNamespacesMap](./kibana-plugin-core-public.savedobjectsfindoptions.typetonamespacesmap.md) | Map<string, string[] | undefined> | This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the type and namespaces fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md
index 36f99e51ea8c..506fb9041e35 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-sortOrder?: estypes.SortOrder;
+sortOrder?: estypes.SearchSortOrder;
```
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 32a2f3312708..604cdea1a7fb 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -159,8 +159,6 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [SavedObjectsCollectMultiNamespaceReferencesObject](./kibana-plugin-core-server.savedobjectscollectmultinamespacereferencesobject.md) | An object to collect references for. It must be a multi-namespace type (in other words, the object type must be registered with the namespaceType: 'multiple' or namespaceType: 'multiple-isolated' option).Note: if options.purpose is 'updateObjectsSpaces', it must be a shareable type (in other words, the object type must be registered with the namespaceType: 'multiple'). |
| [SavedObjectsCollectMultiNamespaceReferencesOptions](./kibana-plugin-core-server.savedobjectscollectmultinamespacereferencesoptions.md) | Options for collecting references. |
| [SavedObjectsCollectMultiNamespaceReferencesResponse](./kibana-plugin-core-server.savedobjectscollectmultinamespacereferencesresponse.md) | The response when object references are collected. |
-| [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
-| [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
| [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) | |
| [SavedObjectsCreatePointInTimeFinderDependencies](./kibana-plugin-core-server.savedobjectscreatepointintimefinderdependencies.md) | |
| [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-core-server.savedobjectsdeletebynamespaceoptions.md) | |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md
deleted file mode 100644
index 3f2d81cc97c7..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) > [doc\_values](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md)
-
-## SavedObjectsComplexFieldMapping.doc\_values property
-
-Signature:
-
-```typescript
-doc_values?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md
deleted file mode 100644
index b01da3c62fda..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) > [dynamic](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md)
-
-## SavedObjectsComplexFieldMapping.dynamic property
-
-The dynamic property of the mapping, either `false` or `'strict'`. If unspecified `dynamic: 'strict'` will be inherited from the top-level index mappings.
-
-Note: To limit the number of mapping fields Saved Object types should \*never\* use `dynamic: true`.
-
-Signature:
-
-```typescript
-dynamic?: false | 'strict';
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md
deleted file mode 100644
index 08513aa2a849..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) > [enabled](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md)
-
-## SavedObjectsComplexFieldMapping.enabled property
-
-Signature:
-
-```typescript
-enabled?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md
deleted file mode 100644
index fc262cad54f1..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md)
-
-## SavedObjectsComplexFieldMapping interface
-
-See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.
-
-Signature:
-
-```typescript
-export interface SavedObjectsComplexFieldMapping
-```
-
-## Properties
-
-| Property | Type | Description |
-| --- | --- | --- |
-| [doc\_values](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md) | boolean | |
-| [dynamic](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md) | false | 'strict' | The dynamic property of the mapping, either false or 'strict'. If unspecified dynamic: 'strict' will be inherited from the top-level index mappings.Note: To limit the number of mapping fields Saved Object types should \*never\* use dynamic: true. |
-| [enabled](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md) | boolean | |
-| [properties](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md) | SavedObjectsMappingProperties | |
-| [type](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md) | string | |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md
deleted file mode 100644
index 613a36a09ba1..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) > [properties](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md)
-
-## SavedObjectsComplexFieldMapping.properties property
-
-Signature:
-
-```typescript
-properties: SavedObjectsMappingProperties;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md
deleted file mode 100644
index 8aaa524dad43..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) > [type](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md)
-
-## SavedObjectsComplexFieldMapping.type property
-
-Signature:
-
-```typescript
-type?: string;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md
deleted file mode 100644
index 2a79eafd85a6..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) > [doc\_values](./kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md)
-
-## SavedObjectsCoreFieldMapping.doc\_values property
-
-Signature:
-
-```typescript
-doc_values?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md
deleted file mode 100644
index 4f88b635ca2f..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) > [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md)
-
-## SavedObjectsCoreFieldMapping.fields property
-
-Signature:
-
-```typescript
-fields?: {
- [subfield: string]: {
- type: string;
- ignore_above?: number;
- };
- };
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.index.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.index.md
deleted file mode 100644
index e3cf685e310d..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.index.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) > [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md)
-
-## SavedObjectsCoreFieldMapping.index property
-
-Signature:
-
-```typescript
-index?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
deleted file mode 100644
index e9b9c2bcf51b..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md)
-
-## SavedObjectsCoreFieldMapping interface
-
-See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.
-
-Signature:
-
-```typescript
-export interface SavedObjectsCoreFieldMapping
-```
-
-## Properties
-
-| Property | Type | Description |
-| --- | --- | --- |
-| [doc\_values](./kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md) | boolean | |
-| [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | {
[subfield: string]: {
type: string;
ignore_above?: number;
};
} | |
-| [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | boolean | |
-| [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | number | boolean | string | |
-| [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | string | |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
deleted file mode 100644
index 627ea3695383..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) > [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md)
-
-## SavedObjectsCoreFieldMapping.null\_value property
-
-Signature:
-
-```typescript
-null_value?: number | boolean | string;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.type.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.type.md
deleted file mode 100644
index 94d395d7983e..000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.type.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) > [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md)
-
-## SavedObjectsCoreFieldMapping.type property
-
-Signature:
-
-```typescript
-type: string;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md
index 925ca4be92e6..85b52bacafa2 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md
@@ -11,5 +11,7 @@ Please refer to [elasticsearch documentation](https://www.elastic.co/guide/en/el
Signature:
```typescript
-export declare type SavedObjectsFieldMapping = SavedObjectsCoreFieldMapping | SavedObjectsComplexFieldMapping;
+export declare type SavedObjectsFieldMapping = estypes.MappingProperty & {
+ dynamic?: false | 'strict';
+};
```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
index a92b1f48d08e..d3696ee71049 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
@@ -30,7 +30,7 @@ export interface SavedObjectsFindOptions
| [searchAfter](./kibana-plugin-core-server.savedobjectsfindoptions.searchafter.md) | estypes.Id[] | Use the sort values from the previous page to retrieve the next page of results. |
| [searchFields](./kibana-plugin-core-server.savedobjectsfindoptions.searchfields.md) | string[] | The fields to perform the parsed query against. See Elasticsearch Simple Query String fields argument for more information |
| [sortField](./kibana-plugin-core-server.savedobjectsfindoptions.sortfield.md) | string | |
-| [sortOrder](./kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md) | estypes.SortOrder | |
+| [sortOrder](./kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md) | estypes.SearchSortOrder | |
| [type](./kibana-plugin-core-server.savedobjectsfindoptions.type.md) | string | string[] | |
| [typeToNamespacesMap](./kibana-plugin-core-server.savedobjectsfindoptions.typetonamespacesmap.md) | Map<string, string[] | undefined> | This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the type and namespaces fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md
index e1c657e3a517..dca5a7d8c758 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-sortOrder?: estypes.SortOrder;
+sortOrder?: estypes.SearchSortOrder;
```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md
index a994fc458cfb..f99e7ba8b967 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-lang?: string;
+lang?: estypes.ScriptLanguage;
```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
index 4e3dea5549b5..29377ff8fd39 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
@@ -26,7 +26,7 @@ export interface IFieldType
| [esTypes](./kibana-plugin-plugins-data-public.ifieldtype.estypes.md) | string[] | |
| [filterable](./kibana-plugin-plugins-data-public.ifieldtype.filterable.md) | boolean | |
| [format](./kibana-plugin-plugins-data-public.ifieldtype.format.md) | any | |
-| [lang](./kibana-plugin-plugins-data-public.ifieldtype.lang.md) | string | |
+| [lang](./kibana-plugin-plugins-data-public.ifieldtype.lang.md) | estypes.ScriptLanguage | |
| [name](./kibana-plugin-plugins-data-public.ifieldtype.name.md) | string | |
| [readFromDocValues](./kibana-plugin-plugins-data-public.ifieldtype.readfromdocvalues.md) | boolean | |
| [script](./kibana-plugin-plugins-data-public.ifieldtype.script.md) | string | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md
index a18c59f44fb5..e42980bb53af 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md
@@ -8,30 +8,22 @@
```typescript
getAggregationRestrictions(): Record> | undefined;
```
Returns:
`Record> | undefined`
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
index b81218eb0888..3666e503e272 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
@@ -9,7 +9,7 @@ Script field language
Signature:
```typescript
-get lang(): string | undefined;
+get lang(): "painless" | "expression" | "mustache" | "java" | undefined;
-set lang(lang: string | undefined);
+set lang(lang: "painless" | "expression" | "mustache" | "java" | undefined);
```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
index 05c807b1cd84..8cd1a476cf32 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
@@ -28,7 +28,7 @@ export declare class IndexPatternField implements IFieldType
| [esTypes](./kibana-plugin-plugins-data-public.indexpatternfield.estypes.md) | | string[] | undefined | |
| [filterable](./kibana-plugin-plugins-data-public.indexpatternfield.filterable.md) | | boolean | |
| [isMapped](./kibana-plugin-plugins-data-public.indexpatternfield.ismapped.md) | | boolean | undefined | Is the field part of the index mapping? |
-| [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) | | string | undefined | Script field language |
+| [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) | | "painless" | "expression" | "mustache" | "java" | undefined | Script field language |
| [name](./kibana-plugin-plugins-data-public.indexpatternfield.name.md) | | string | |
| [readFromDocValues](./kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md) | | boolean | |
| [runtimeField](./kibana-plugin-plugins-data-public.indexpatternfield.runtimefield.md) | | RuntimeField | undefined | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
index f0600dd20658..8882fa05ce0c 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
@@ -10,7 +10,7 @@
toJSON(): {
count: number;
script: string | undefined;
- lang: string | undefined;
+ lang: "painless" | "expression" | "mustache" | "java" | undefined;
conflictDescriptions: Record | undefined;
name: string;
type: string;
@@ -28,7 +28,7 @@ toJSON(): {
`{
count: number;
script: string | undefined;
- lang: string | undefined;
+ lang: "painless" | "expression" | "mustache" | "java" | undefined;
conflictDescriptions: Record | undefined;
name: string;
type: string;
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md
index 090b78a7078c..8d0447d58634 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md
@@ -12,7 +12,7 @@ export declare type PhraseFilter = Filter & {
script?: {
script: {
source?: any;
- lang?: string;
+ lang?: estypes.ScriptLanguage;
params: any;
};
};
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md
index fbe04f5e0a2a..1cb627ec3a8f 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md
@@ -12,7 +12,7 @@ export declare type RangeFilter = Filter & EsRangeFilter & {
script?: {
script: {
params: any;
- lang: string;
+ lang: estypes.ScriptLanguage;
source: any;
};
};
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md
index 095142cf0f05..757d8f34a0c3 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-lang?: string;
+lang?: estypes.ScriptLanguage;
```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md
index a1a76f2d2a29..fb39333cf245 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md
@@ -15,7 +15,7 @@ export interface Reason
| Property | Type | Description |
| --- | --- | --- |
| [caused\_by](./kibana-plugin-plugins-data-public.reason.caused_by.md) | {
type: string;
reason: string;
} | |
-| [lang](./kibana-plugin-plugins-data-public.reason.lang.md) | string | |
+| [lang](./kibana-plugin-plugins-data-public.reason.lang.md) | estypes.ScriptLanguage | |
| [position](./kibana-plugin-plugins-data-public.reason.position.md) | {
offset: number;
start: number;
end: number;
} | |
| [reason](./kibana-plugin-plugins-data-public.reason.reason.md) | string | |
| [script\_stack](./kibana-plugin-plugins-data-public.reason.script_stack.md) | string[] | |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md
index d033804cb6fc..3d5a757cb8f1 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-lang?: string;
+lang?: estypes.ScriptLanguage;
```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
index 5ac48d26a85d..bbc4cc2135d4 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
@@ -26,7 +26,7 @@ export interface IFieldType
| [esTypes](./kibana-plugin-plugins-data-server.ifieldtype.estypes.md) | string[] | |
| [filterable](./kibana-plugin-plugins-data-server.ifieldtype.filterable.md) | boolean | |
| [format](./kibana-plugin-plugins-data-server.ifieldtype.format.md) | any | |
-| [lang](./kibana-plugin-plugins-data-server.ifieldtype.lang.md) | string | |
+| [lang](./kibana-plugin-plugins-data-server.ifieldtype.lang.md) | estypes.ScriptLanguage | |
| [name](./kibana-plugin-plugins-data-server.ifieldtype.name.md) | string | |
| [readFromDocValues](./kibana-plugin-plugins-data-server.ifieldtype.readfromdocvalues.md) | boolean | |
| [script](./kibana-plugin-plugins-data-server.ifieldtype.script.md) | string | |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md
index 981f28a51ae0..33f1ac5e3166 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md
@@ -6,6 +6,7 @@
> Warning: This API is now obsolete.
>
+> use runtime field instead
>
Add scripted field to field list
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getaggregationrestrictions.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getaggregationrestrictions.md
index 10af562f74b9..b655e779e4fa 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getaggregationrestrictions.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getaggregationrestrictions.md
@@ -8,30 +8,22 @@
```typescript
getAggregationRestrictions(): Record> | undefined;
```
Returns:
`Record> | undefined`
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md
index cff2c5de98de..e791dfc7c373 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md
@@ -6,6 +6,7 @@
> Warning: This API is now obsolete.
>
+> use runtime field instead
>
Signature:
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md
index 62b8f1b62ac7..95f9f3130967 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md
@@ -6,6 +6,7 @@
> Warning: This API is now obsolete.
>
+> use runtime field instead
>
Signature:
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md
index f6beed7389e4..b351eba2ace4 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md
@@ -6,6 +6,7 @@
> Warning: This API is now obsolete.
>
+> use runtime field instead
>
Remove scripted field from field list
diff --git a/examples/search_examples/public/search_sessions/app.tsx b/examples/search_examples/public/search_sessions/app.tsx
index a768600db24e..7fdf91537c97 100644
--- a/examples/search_examples/public/search_sessions/app.tsx
+++ b/examples/search_examples/public/search_sessions/app.tsx
@@ -702,7 +702,7 @@ function doSearch(
const startTs = performance.now();
// Submit the search request using the `data.search` service.
- // @ts-expect-error request.params is incompatible. Filter is not assignable to QueryContainer
+ // @ts-expect-error request.params is incompatible. Filter is not assignable to QueryDslQueryContainer
return data.search
.search(req, { sessionId })
.pipe(
diff --git a/package.json b/package.json
index 025a278d197a..83550df3d786 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
"@elastic/apm-rum-react": "^1.2.5",
"@elastic/charts": "30.0.0",
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
- "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@7.13.0-canary.1",
+ "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@7.14.0-canary.6",
"@elastic/ems-client": "7.13.0",
"@elastic/eui": "33.0.0",
"@elastic/filesaver": "1.1.2",
diff --git a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
index b8d9237bc320..f4399eff262e 100644
--- a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
@@ -19,7 +19,7 @@ import { deleteIndex } from './delete_index';
import { ES_CLIENT_HEADERS } from '../../client_headers';
interface DocRecord {
- value: estypes.IndexState & {
+ value: estypes.IndicesIndexState & {
index: string;
type: string;
};
diff --git a/packages/kbn-es-archiver/src/lib/indices/delete_index.ts b/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
index 2a42d52e2ca8..d3d6f85d7a36 100644
--- a/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
@@ -126,7 +126,7 @@ export async function waitForSnapshotCompletion(
const { body: repositoryMap } = await client.snapshot.getRepository({} as any);
for (const repository of Object.keys(repositoryMap)) {
const allInProgress = await getInProgressSnapshots(repository);
- const found = allInProgress.find((s: any) => s.indices.includes(index));
+ const found = allInProgress?.find((s: any) => s.indices.includes(index));
if (!found) {
continue;
diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
index f95bf956e2e2..29c0a03ab61f 100644
--- a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -36,7 +36,7 @@ export async function deleteKibanaIndices({
await client.indices.putSettings(
{
index: indexNames,
- body: { index: { blocks: { read_only: false } } },
+ body: { settings: { blocks: { read_only: false } } },
},
{
headers: ES_CLIENT_HEADERS,
@@ -126,7 +126,7 @@ export async function cleanKibanaIndices({
},
},
},
- } as estypes.QueryContainer,
+ } as estypes.QueryDslQueryContainer,
},
},
{
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 667863d29623..8df1bae24388 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -1249,7 +1249,7 @@ export interface SavedObjectsCreateOptions {
// @public (undocumented)
export interface SavedObjectsFindOptions {
// @alpha
- aggs?: Record;
+ aggs?: Record;
defaultSearchOperator?: 'AND' | 'OR';
fields?: string[];
// Warning: (ae-forgotten-export) The symbol "KueryNode" needs to be exported by the entry point index.d.ts
@@ -1275,7 +1275,7 @@ export interface SavedObjectsFindOptions {
// (undocumented)
sortField?: string;
// (undocumented)
- sortOrder?: estypes.SortOrder;
+ sortOrder?: estypes.SearchSortOrder;
// (undocumented)
type: string | string[];
typeToNamespacesMap?: Map;
diff --git a/src/core/server/elasticsearch/version_check/ensure_es_version.ts b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
index 43cd52f1b572..e1f18f8ad836 100644
--- a/src/core/server/elasticsearch/version_check/ensure_es_version.ts
+++ b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
@@ -31,7 +31,7 @@ export interface PollEsNodesVersionOptions {
interface NodeInfo {
version: string;
ip: string;
- http: {
+ http?: {
publish_address: string;
};
name: string;
diff --git a/src/core/server/http/integration_tests/core_services.test.ts b/src/core/server/http/integration_tests/core_services.test.ts
index 5433f0d3c3e3..99b63fc73687 100644
--- a/src/core/server/http/integration_tests/core_services.test.ts
+++ b/src/core/server/http/integration_tests/core_services.test.ts
@@ -405,7 +405,7 @@ describe('http service', () => {
const { body } = await kbnTestServer.request.get(root, '/new-platform/').expect(400);
- expect(body.message).toEqual('[error_type]: error_reason');
+ expect(body.message).toMatch('[error_type]: error_reason');
});
});
});
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 2e495657d341..ef1ee69ff529 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -339,8 +339,6 @@ export type {
SavedObjectsDeleteByNamespaceOptions,
SavedObjectsIncrementCounterOptions,
SavedObjectsIncrementCounterField,
- SavedObjectsComplexFieldMapping,
- SavedObjectsCoreFieldMapping,
SavedObjectsFieldMapping,
SavedObjectsTypeMappingDefinition,
SavedObjectsMappingProperties,
diff --git a/src/core/server/saved_objects/index.ts b/src/core/server/saved_objects/index.ts
index 2af25e0cdef3..b1b1584d7de8 100644
--- a/src/core/server/saved_objects/index.ts
+++ b/src/core/server/saved_objects/index.ts
@@ -72,8 +72,6 @@ export type {
} from './service/lib/repository';
export type {
- SavedObjectsCoreFieldMapping,
- SavedObjectsComplexFieldMapping,
SavedObjectsFieldMapping,
SavedObjectsMappingProperties,
SavedObjectsTypeMappingDefinition,
diff --git a/src/core/server/saved_objects/mappings/index.ts b/src/core/server/saved_objects/mappings/index.ts
index bf1029e9f3b8..5da185ace79c 100644
--- a/src/core/server/saved_objects/mappings/index.ts
+++ b/src/core/server/saved_objects/mappings/index.ts
@@ -8,8 +8,6 @@
export { getTypes, getProperty, getRootProperties, getRootPropertiesObjects } from './lib';
export type {
- SavedObjectsComplexFieldMapping,
- SavedObjectsCoreFieldMapping,
SavedObjectsTypeMappingDefinition,
SavedObjectsTypeMappingDefinitions,
SavedObjectsMappingProperties,
diff --git a/src/core/server/saved_objects/mappings/lib/get_property.test.ts b/src/core/server/saved_objects/mappings/lib/get_property.test.ts
index dab712bbb87a..8732b5e07d3f 100644
--- a/src/core/server/saved_objects/mappings/lib/get_property.test.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_property.test.ts
@@ -34,7 +34,7 @@ const MAPPINGS = {
},
},
},
-};
+} as const;
function runTest(key: string | string[], mapping: IndexMapping | SavedObjectsFieldMapping) {
expect(typeof key === 'string' || Array.isArray(key)).toBeTruthy();
diff --git a/src/core/server/saved_objects/mappings/lib/get_property.ts b/src/core/server/saved_objects/mappings/lib/get_property.ts
index c2daa1e70a89..2a9993bc175c 100644
--- a/src/core/server/saved_objects/mappings/lib/get_property.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_property.ts
@@ -7,7 +7,7 @@
*/
import { toPath } from 'lodash';
-import { SavedObjectsCoreFieldMapping, SavedObjectsFieldMapping, IndexMapping } from '../types';
+import { SavedObjectsFieldMapping, IndexMapping } from '../types';
function getPropertyMappingFromObjectMapping(
mapping: IndexMapping | SavedObjectsFieldMapping,
@@ -15,7 +15,7 @@ function getPropertyMappingFromObjectMapping(
): SavedObjectsFieldMapping | undefined {
const props =
(mapping && (mapping as IndexMapping).properties) ||
- (mapping && (mapping as SavedObjectsCoreFieldMapping).fields);
+ (mapping && (mapping as SavedObjectsFieldMapping).fields);
if (!props) {
return undefined;
diff --git a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts
index 2daca3a1fdd8..cbc6808418bc 100644
--- a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts
@@ -15,7 +15,7 @@ test(`returns single object with properties`, () => {
properties: {},
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({
@@ -32,7 +32,7 @@ test(`returns single object with type === 'object'`, () => {
type: 'object',
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({
@@ -75,7 +75,7 @@ test(`returns two objects with type === 'object'`, () => {
type: 'object',
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({
@@ -95,7 +95,7 @@ test(`excludes objects without properties and type of keyword`, () => {
type: 'keyword',
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({});
@@ -111,7 +111,7 @@ test(`excludes two objects without properties and type of keyword`, () => {
type: 'keyword',
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({});
@@ -127,7 +127,7 @@ test(`includes one object with properties and excludes one object without proper
type: 'keyword',
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({
@@ -147,7 +147,7 @@ test(`includes one object with type === 'object' and excludes one object without
type: 'keyword',
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({
@@ -170,7 +170,7 @@ test('excludes references and migrationVersion which are part of the blacklist',
type: 'object',
},
},
- };
+ } as const;
const result = getRootPropertiesObjects(mappings);
expect(result).toEqual({
foo: {
diff --git a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts
index 3a25865c03b2..54ea4eafc186 100644
--- a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts
@@ -6,11 +6,7 @@
* Side Public License, v 1.
*/
-import {
- SavedObjectsComplexFieldMapping,
- IndexMapping,
- SavedObjectsMappingProperties,
-} from '../types';
+import { SavedObjectsFieldMapping, IndexMapping, SavedObjectsMappingProperties } from '../types';
import { getRootProperties } from './get_root_properties';
/**
@@ -36,7 +32,7 @@ export function getRootPropertiesObjects(mappings: IndexMapping) {
// we consider the existence of the properties or type of object to designate that this is an object datatype
if (
!omittedRootProps.includes(key) &&
- ((value as SavedObjectsComplexFieldMapping).properties || value.type === 'object')
+ ((value as SavedObjectsFieldMapping).properties || value.type === 'object')
) {
acc[key] = value;
}
diff --git a/src/core/server/saved_objects/mappings/types.ts b/src/core/server/saved_objects/mappings/types.ts
index 25fb61de9351..e2ad2a91fd00 100644
--- a/src/core/server/saved_objects/mappings/types.ts
+++ b/src/core/server/saved_objects/mappings/types.ts
@@ -6,6 +6,7 @@
* Side Public License, v 1.
*/
+import type { estypes } from '@elastic/elasticsearch';
/**
* Describe a saved object type mapping.
*
@@ -96,9 +97,17 @@ export interface SavedObjectsMappingProperties {
*
* @public
*/
-export type SavedObjectsFieldMapping =
- | SavedObjectsCoreFieldMapping
- | SavedObjectsComplexFieldMapping;
+export type SavedObjectsFieldMapping = estypes.MappingProperty & {
+ /**
+ * The dynamic property of the mapping, either `false` or `'strict'`. If
+ * unspecified `dynamic: 'strict'` will be inherited from the top-level
+ * index mappings.
+ *
+ * Note: To limit the number of mapping fields Saved Object types should
+ * *never* use `dynamic: true`.
+ */
+ dynamic?: false | 'strict';
+};
/** @internal */
export interface IndexMapping {
@@ -114,42 +123,3 @@ export interface IndexMappingMeta {
// the md5 hash of that mapping's value when the index was created.
migrationMappingPropertyHashes?: { [k: string]: string };
}
-
-/**
- * See {@link SavedObjectsFieldMapping} for documentation.
- *
- * @public
- */
-export interface SavedObjectsCoreFieldMapping {
- type: string;
- null_value?: number | boolean | string;
- index?: boolean;
- doc_values?: boolean;
- fields?: {
- [subfield: string]: {
- type: string;
- ignore_above?: number;
- };
- };
-}
-
-/**
- * See {@link SavedObjectsFieldMapping} for documentation.
- *
- * @public
- */
-export interface SavedObjectsComplexFieldMapping {
- /**
- * The dynamic property of the mapping, either `false` or `'strict'`. If
- * unspecified `dynamic: 'strict'` will be inherited from the top-level
- * index mappings.
- *
- * Note: To limit the number of mapping fields Saved Object types should
- * *never* use `dynamic: true`.
- */
- dynamic?: false | 'strict';
- enabled?: boolean;
- doc_values?: boolean;
- type?: string;
- properties: SavedObjectsMappingProperties;
-}
diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
index 5465da2f620a..a39fff20abbe 100644
--- a/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
+++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
@@ -19,19 +19,19 @@ describe('buildActiveMappings', () => {
const properties = {
aaa: { type: 'text' },
bbb: { type: 'long' },
- };
+ } as const;
expect(buildActiveMappings(properties)).toMatchSnapshot();
});
test('disallows duplicate mappings', () => {
- const properties = { type: { type: 'long' } };
+ const properties = { type: { type: 'long' } } as const;
expect(() => buildActiveMappings(properties)).toThrow(/Cannot redefine core mapping \"type\"/);
});
test('disallows mappings with leading underscore', () => {
- const properties = { _hm: { type: 'keyword' } };
+ const properties = { _hm: { type: 'keyword' } } as const;
expect(() => buildActiveMappings(properties)).toThrow(
/Invalid mapping \"_hm\"\. Mappings cannot start with _/
@@ -60,7 +60,7 @@ describe('buildActiveMappings', () => {
aaa: { type: 'keyword', fields: { a: { type: 'keyword' }, b: { type: 'text' } } },
bbb: { fields: { b: { type: 'text' }, a: { type: 'keyword' } }, type: 'keyword' },
ccc: { fields: { b: { type: 'text' }, a: { type: 'text' } }, type: 'keyword' },
- };
+ } as const;
const mappings = buildActiveMappings(properties);
const hashes = mappings._meta!.migrationMappingPropertyHashes!;
diff --git a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
index c7a3251e33ab..731b7f8c029c 100644
--- a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
+++ b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
@@ -36,7 +36,7 @@ test('mappings without index pattern goes to default index', () => {
type1: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
@@ -48,7 +48,7 @@ test('mappings without index pattern goes to default index', () => {
type1: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
@@ -69,7 +69,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
type1: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
@@ -81,7 +81,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
type1: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
@@ -103,7 +103,7 @@ test('creating a script gets added to the index pattern', () => {
type1: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
@@ -116,7 +116,7 @@ test('creating a script gets added to the index pattern', () => {
type1: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
@@ -144,18 +144,18 @@ test('throws when two scripts are defined for an index pattern', () => {
type1: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
type2: {
properties: {
field1: {
- type: 'string',
+ type: 'text',
},
},
},
- };
+ } as const;
expect(() =>
createIndexMap({
kibanaIndexName: defaultIndex,
diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
index 1d2ec6abc0dd..c9c24cc85a45 100644
--- a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
+++ b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
@@ -40,10 +40,10 @@ describe('ElasticIndex', () => {
return elasticsearchClientMock.createSuccessTransportRequestPromise({
[index]: {
aliases: { foo: index },
- mappings: { dynamic: 'strict', properties: { a: 'b' } },
+ mappings: { dynamic: 'strict', properties: { a: 'b' } as any },
settings: {},
},
- } as estypes.GetIndexResponse);
+ } as estypes.IndicesGetResponse);
});
const info = await Index.fetchInfo(client, '.baz');
@@ -164,7 +164,7 @@ describe('ElasticIndex', () => {
client.tasks.get.mockResolvedValue(
elasticsearchClientMock.createSuccessTransportRequestPromise({
completed: true,
- } as estypes.GetTaskResponse)
+ } as estypes.TaskGetResponse)
);
const info = {
@@ -175,7 +175,7 @@ describe('ElasticIndex', () => {
dynamic: 'strict' as const,
properties: { foo: { type: 'keyword' } },
},
- };
+ } as const;
await Index.convertToAlias(
client,
@@ -248,7 +248,7 @@ describe('ElasticIndex', () => {
reason: 'all shards failed',
failed_shards: [],
},
- } as estypes.GetTaskResponse)
+ } as estypes.TaskGetResponse)
);
const info = {
diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.ts b/src/core/server/saved_objects/migrations/core/elastic_index.ts
index 76fdd5e73d80..296a4cee07c1 100644
--- a/src/core/server/saved_objects/migrations/core/elastic_index.ts
+++ b/src/core/server/saved_objects/migrations/core/elastic_index.ts
@@ -32,7 +32,7 @@ export interface FullIndexInfo {
// saved objects which are no longer used. These saved objects will still be
// kept in the outdated index for backup purposes, but won't be available in
// the upgraded index.
-export const excludeUnusedTypesQuery: estypes.QueryContainer = {
+export const excludeUnusedTypesQuery: estypes.QueryDslQueryContainer = {
bool: {
must_not: [
// https://github.com/elastic/kibana/issues/91869
@@ -401,7 +401,6 @@ async function reindex(
task_id: String(task),
});
- // @ts-expect-error @elastic/elasticsearch GetTaskResponse doesn't contain `error` property
const e = body.error;
if (e) {
throw new Error(`Re-index failed [${e.type}] ${e.reason} :: ${JSON.stringify(e)}`);
diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index fcc03f363139..64d4fa3609e9 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -450,7 +450,7 @@ function withIndex(
client.tasks.get.mockReturnValue(
elasticsearchClientMock.createSuccessTransportRequestPromise({
completed: true,
- } as estypes.GetTaskResponse)
+ } as estypes.TaskGetResponse)
);
client.search.mockReturnValue(
elasticsearchClientMock.createSuccessTransportRequestPromise(searchResult(0) as any)
diff --git a/src/core/server/saved_objects/migrations/core/migration_context.test.ts b/src/core/server/saved_objects/migrations/core/migration_context.test.ts
index 5f2e8a37ec42..240b41266abb 100644
--- a/src/core/server/saved_objects/migrations/core/migration_context.test.ts
+++ b/src/core/server/saved_objects/migrations/core/migration_context.test.ts
@@ -31,7 +31,7 @@ describe('disableUnknownTypeMappingFields', () => {
},
},
},
- };
+ } as const;
const activeMappings = {
_meta: {
migrationMappingPropertyHashes: {
@@ -46,7 +46,7 @@ describe('disableUnknownTypeMappingFields', () => {
},
},
},
- };
+ } as const;
const targetMappings = disableUnknownTypeMappingFields(activeMappings, sourceMappings);
it('disables complex field mappings from unknown types in the source mappings', () => {
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
index 37cea5d2de3d..d0cc52f2dd9b 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
@@ -320,7 +320,11 @@ const mockV2MigrationOptions = () => {
)
);
options.client.indices.addBlock.mockReturnValue(
- elasticsearchClientMock.createSuccessTransportRequestPromise({ acknowledged: true })
+ elasticsearchClientMock.createSuccessTransportRequestPromise({
+ acknowledged: true,
+ shards_acknowledged: true,
+ indices: [],
+ })
);
options.client.reindex.mockReturnValue(
elasticsearchClientMock.createSuccessTransportRequestPromise({
@@ -333,7 +337,7 @@ const mockV2MigrationOptions = () => {
error: undefined,
failures: [],
task: { description: 'task description' } as any,
- } as estypes.GetTaskResponse)
+ } as estypes.TaskGetResponse)
);
options.client.search = jest
diff --git a/src/core/server/saved_objects/migrationsv2/actions/create_index.ts b/src/core/server/saved_objects/migrationsv2/actions/create_index.ts
index 47ee44e762db..8e5042a5ff8f 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/create_index.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/create_index.ts
@@ -24,8 +24,8 @@ import {
} from './constants';
import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
-function aliasArrayToRecord(aliases: string[]): Record {
- const result: Record = {};
+function aliasArrayToRecord(aliases: string[]): Record {
+ const result: Record = {};
for (const alias of aliases) {
result[alias] = {};
}
diff --git a/src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts b/src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts
index b508a6198bfb..3fa4d59e383b 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts
@@ -242,9 +242,7 @@ describe('migration actions', () => {
it('rejects if there is a non-retryable error', async () => {
expect.assertions(1);
const task = removeWriteBlock({ client, index: 'no_such_index' });
- await expect(task()).rejects.toMatchInlineSnapshot(
- `[ResponseError: index_not_found_exception]`
- );
+ await expect(task()).rejects.toThrow('index_not_found_exception');
});
});
@@ -264,7 +262,7 @@ describe('migration actions', () => {
// Allocate 1 replica so that this index stays yellow
number_of_replicas: '1',
// Disable all shard allocation so that the index status is red
- index: { routing: { allocation: { enable: 'none' } } },
+ routing: { allocation: { enable: 'none' } },
},
},
},
@@ -284,7 +282,7 @@ describe('migration actions', () => {
index: 'red_then_yellow_index',
body: {
// Enable all shard allocation so that the index status turns yellow
- index: { routing: { allocation: { enable: 'all' } } },
+ settings: { routing: { allocation: { enable: 'all' } } },
},
});
@@ -354,7 +352,7 @@ describe('migration actions', () => {
index: 'clone_red_then_yellow_index',
body: {
// Enable all shard allocation so that the index status goes yellow
- index: { routing: { allocation: { enable: 'all' } } },
+ settings: { routing: { allocation: { enable: 'all' } } },
},
});
indexYellow = true;
@@ -859,9 +857,7 @@ describe('migration actions', () => {
sourceIndex: 'no_such_index',
targetIndex: 'existing_index_2',
});
- await expect(task()).rejects.toMatchInlineSnapshot(
- `[ResponseError: index_not_found_exception]`
- );
+ await expect(task()).rejects.toThrow('index_not_found_exception');
task = verifyReindex({
client,
@@ -1142,10 +1138,7 @@ describe('migration actions', () => {
timeout: '10s',
});
- await expect(task()).rejects.toMatchInlineSnapshot(`
- [Error: pickupUpdatedMappings task failed with the following error:
- {"type":"index_not_found_exception","reason":"no such index [no_such_index]","resource.type":"index_or_alias","resource.id":"no_such_index","index_uuid":"_na_","index":"no_such_index"}]
- `);
+ await expect(task()).rejects.toThrow('index_not_found_exception');
});
it('resolves left wait_for_task_completion_timeout when the task does not complete within the timeout', async () => {
const res = (await pickupUpdatedMappings(
@@ -1433,7 +1426,7 @@ describe('migration actions', () => {
index: 'red_then_yellow_index',
body: {
// Disable all shard allocation so that the index status is red
- index: { routing: { allocation: { enable: 'all' } } },
+ settings: { routing: { allocation: { enable: 'all' } } },
},
});
indexYellow = true;
@@ -1455,7 +1448,7 @@ describe('migration actions', () => {
// failure
await expect(
createIndex({ client, indexName: 'existing_index_2_alias', mappings: undefined as any })()
- ).rejects.toMatchInlineSnapshot(`[ResponseError: invalid_index_name_exception]`);
+ ).rejects.toThrow('invalid_index_name_exception');
});
});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.ts b/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.ts
index 16f1df05f26b..b101e7db0141 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.ts
@@ -28,7 +28,7 @@ export interface ReadWithPit {
export interface ReadWithPitParams {
client: ElasticsearchClient;
pitId: string;
- query: estypes.QueryContainer;
+ query: estypes.QueryDslQueryContainer;
batchSize: number;
searchAfter?: number[];
seqNoPrimaryTerm?: boolean;
diff --git a/src/core/server/saved_objects/migrationsv2/actions/reindex.ts b/src/core/server/saved_objects/migrationsv2/actions/reindex.ts
index ca8d3b594703..e9cfb4b61dac 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/reindex.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/reindex.ts
@@ -32,7 +32,7 @@ export interface ReindexParams {
* are no longer used. These saved objects will still be kept in the outdated
* index for backup purposes, but won't be available in the upgraded index.
*/
- unusedTypesQuery: estypes.QueryContainer;
+ unusedTypesQuery: estypes.QueryDslQueryContainer;
}
/**
* Reindex documents from the `sourceIndex` into the `targetIndex`. Returns a
diff --git a/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.ts b/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.ts
index c55e4a235fbf..b5bf64d5c29f 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.ts
@@ -39,7 +39,7 @@ export const removeWriteBlock = ({
// Don't change any existing settings
preserve_existing: true,
body: {
- index: {
+ settings: {
blocks: {
write: false,
},
diff --git a/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.ts b/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.ts
index 7406cd35b159..c27170a78245 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.ts
@@ -24,7 +24,7 @@ export interface SearchResponse {
export interface SearchForOutdatedDocumentsOptions {
batchSize: number;
targetIndex: string;
- outdatedDocumentsQuery?: estypes.QueryContainer;
+ outdatedDocumentsQuery?: estypes.QueryDslQueryContainer;
}
/**
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.ts
index fcadb5e80298..18cf3350292b 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.ts
@@ -42,7 +42,7 @@ export const waitForReindexTask = flow(
if (res.error.value.type === 'index_not_found_exception') {
return TaskEither.left({
type: 'index_not_found_exception' as const,
- index: res.error.value.index,
+ index: res.error.value.index!,
});
} else {
throw new Error('Reindex failed with the following error:\n' + JSON.stringify(res.error));
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.ts
index 4e3631797e34..0cdaa88c535a 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.ts
@@ -16,7 +16,7 @@ import {
} from './catch_retryable_es_client_errors';
/** @internal */
export interface WaitForTaskResponse {
- error: Option.Option<{ type: string; reason: string; index: string }>;
+ error: Option.Option<{ type: string; reason: string; index?: string }>;
completed: boolean;
failures: Option.Option;
description?: string;
@@ -84,7 +84,6 @@ export const waitForTask = ({
const failures = body.response?.failures ?? [];
return Either.right({
completed: body.completed,
- // @ts-expect-error @elastic/elasticsearch GetTaskResponse doesn't declare `error` property
error: Option.fromNullable(body.error),
failures: failures.length > 0 ? Option.some(failures) : Option.none,
description: body.task.description,
diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
index 695811d4c46f..e82f2b222bb4 100644
--- a/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
@@ -157,7 +157,10 @@ describe('migration v2', () => {
const response = body[migratedIndex];
expect(response).toBeDefined();
- expect(Object.keys(response.aliases).sort()).toEqual(['.kibana', `.kibana_${kibanaVersion}`]);
+ expect(Object.keys(response.aliases!).sort()).toEqual([
+ '.kibana',
+ `.kibana_${kibanaVersion}`,
+ ]);
});
it('copies all the document of the previous index to the new one', async () => {
diff --git a/src/core/server/saved_objects/migrationsv2/model.test.ts b/src/core/server/saved_objects/migrationsv2/model.test.ts
index 186cb24b4a34..86dc590aabda 100644
--- a/src/core/server/saved_objects/migrationsv2/model.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/model.test.ts
@@ -244,7 +244,7 @@ describe('migrations v2 model', () => {
disabled_saved_object_type: '7997cf5a56cc02bdc9c93361bde732b0',
},
},
- };
+ } as const;
test('INIT -> OUTDATED_DOCUMENTS_SEARCH_OPEN_PIT if .kibana is already pointing to the target index', () => {
const res: ResponseType<'INIT'> = Either.right({
@@ -683,7 +683,7 @@ describe('migrations v2 model', () => {
disabled_saved_object_type: '7997cf5a56cc02bdc9c93361bde732b0',
},
},
- };
+ } as const;
const waitForYellowSourceState: WaitForYellowSourceState = {
...baseState,
diff --git a/src/core/server/saved_objects/migrationsv2/types.ts b/src/core/server/saved_objects/migrationsv2/types.ts
index adcd2ad32fd2..1151e8337d3d 100644
--- a/src/core/server/saved_objects/migrationsv2/types.ts
+++ b/src/core/server/saved_objects/migrationsv2/types.ts
@@ -53,7 +53,7 @@ export interface BaseState extends ControlState {
readonly tempIndexMappings: IndexMapping;
/** Script to apply to a legacy index before it can be used as a migration source */
readonly preMigrationScript: Option.Option;
- readonly outdatedDocumentsQuery: estypes.QueryContainer;
+ readonly outdatedDocumentsQuery: estypes.QueryDslQueryContainer;
readonly retryCount: number;
readonly retryDelay: number;
/**
@@ -112,7 +112,7 @@ export interface BaseState extends ControlState {
* are no longer used. These saved objects will still be kept in the outdated
* index for backup purposes, but won't be available in the upgraded index.
*/
- readonly unusedTypesQuery: estypes.QueryContainer;
+ readonly unusedTypesQuery: estypes.QueryDslQueryContainer;
}
export interface InitState extends BaseState {
@@ -132,7 +132,7 @@ export interface PostInitState extends BaseState {
/** The target index is the index to which the migration writes */
readonly targetIndex: string;
readonly versionIndexReadyActions: Option.Option;
- readonly outdatedDocumentsQuery: estypes.QueryContainer;
+ readonly outdatedDocumentsQuery: estypes.QueryDslQueryContainer;
}
export interface DoneState extends PostInitState {
diff --git a/src/core/server/saved_objects/saved_objects_type_registry.ts b/src/core/server/saved_objects/saved_objects_type_registry.ts
index a63837132b65..ba5960c59239 100644
--- a/src/core/server/saved_objects/saved_objects_type_registry.ts
+++ b/src/core/server/saved_objects/saved_objects_type_registry.ts
@@ -33,7 +33,7 @@ export class SavedObjectTypeRegistry {
throw new Error(`Type '${type.name}' is already registered`);
}
validateType(type);
- this.types.set(type.name, deepFreeze(type));
+ this.types.set(type.name, deepFreeze(type) as SavedObjectsType);
}
/**
diff --git a/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts b/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts
index 57421db76f5b..53f1b5c9d78c 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts
@@ -9,7 +9,7 @@
import type { estypes } from '@elastic/elasticsearch';
import { validateAndConvertAggregations } from './validation';
-type AggsMap = Record;
+type AggsMap = Record;
const mockMappings = {
properties: {
@@ -19,7 +19,9 @@ const mockMappings = {
references: {
type: 'nested',
properties: {
- id: 'keyword',
+ id: {
+ type: 'keyword',
+ },
},
},
foo: {
@@ -31,7 +33,7 @@ const mockMappings = {
type: 'text',
},
bytes: {
- type: 'number',
+ type: 'integer',
},
},
},
@@ -73,7 +75,7 @@ const mockMappings = {
},
},
},
-};
+} as const;
describe('validateAndConvertAggregations', () => {
it('validates a simple aggregations', () => {
diff --git a/src/core/server/saved_objects/service/lib/aggregations/validation.ts b/src/core/server/saved_objects/service/lib/aggregations/validation.ts
index cd41a23f4a28..5ef89f297a79 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/validation.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/validation.ts
@@ -37,9 +37,9 @@ interface ValidationContext {
*/
export const validateAndConvertAggregations = (
allowedTypes: string[],
- aggs: Record,
+ aggs: Record,
indexMapping: IndexMapping
-): Record => {
+): Record => {
return validateAggregations(aggs, {
allowedTypes,
indexMapping,
@@ -53,16 +53,15 @@ export const validateAndConvertAggregations = (
* Or a nested record of aggregation (`SearchRequest.body.aggs.myAggregation.aggs`)
*/
const validateAggregations = (
- aggregations: Record,
+ aggregations: Record,
context: ValidationContext
) => {
- return Object.entries(aggregations).reduce>(
- (memo, [aggrName, aggrContainer]) => {
- memo[aggrName] = validateAggregation(aggrContainer, childContext(context, aggrName));
- return memo;
- },
- {}
- );
+ return Object.entries(aggregations).reduce<
+ Record
+ >((memo, [aggrName, aggrContainer]) => {
+ memo[aggrName] = validateAggregation(aggrContainer, childContext(context, aggrName));
+ return memo;
+ }, {});
};
/**
@@ -70,7 +69,7 @@ const validateAggregations = (
* from a nested aggregation record, including its potential nested aggregations.
*/
const validateAggregation = (
- aggregation: estypes.AggregationContainer,
+ aggregation: estypes.AggregationsAggregationContainer,
context: ValidationContext
) => {
const container = validateAggregationContainer(aggregation, context);
@@ -93,10 +92,10 @@ const validateAggregation = (
* (ignoring its nested aggregations)
*/
const validateAggregationContainer = (
- container: estypes.AggregationContainer,
+ container: estypes.AggregationsAggregationContainer,
context: ValidationContext
) => {
- return Object.entries(container).reduce(
+ return Object.entries(container).reduce(
(memo, [aggName, aggregation]) => {
if (aggregationKeys.includes(aggName)) {
return memo;
diff --git a/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts b/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts
index 25c3aea474ec..0425e46b4477 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/
-import { IndexMapping } from '../../../mappings';
import {
isRootLevelAttribute,
rewriteRootLevelAttribute,
@@ -14,7 +13,7 @@ import {
rewriteObjectTypeAttribute,
} from './validation_utils';
-const mockMappings: IndexMapping = {
+const mockMappings = {
properties: {
updated_at: {
type: 'date',
@@ -28,7 +27,7 @@ const mockMappings: IndexMapping = {
type: 'text',
},
bytes: {
- type: 'number',
+ type: 'integer',
},
},
},
@@ -70,7 +69,7 @@ const mockMappings: IndexMapping = {
},
},
},
-};
+} as const;
describe('isRootLevelAttribute', () => {
it('returns true when referring to a path to a valid root level field', () => {
diff --git a/src/core/server/saved_objects/service/lib/filter_utils.test.ts b/src/core/server/saved_objects/service/lib/filter_utils.test.ts
index 2ef5219ccfff..e6934398862d 100644
--- a/src/core/server/saved_objects/service/lib/filter_utils.test.ts
+++ b/src/core/server/saved_objects/service/lib/filter_utils.test.ts
@@ -31,7 +31,7 @@ const mockMappings = {
type: 'text',
},
bytes: {
- type: 'number',
+ type: 'integer',
},
},
},
@@ -90,7 +90,7 @@ const mockMappings = {
},
},
},
-};
+} as const;
describe('Filter Utils', () => {
describe('#validateConvertFilterToKueryNode', () => {
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index c626a2b2acfb..6b51bd57248a 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -672,7 +672,6 @@ export class SavedObjectsRepository {
}
const deleteDocNotFound = body.result === 'not_found';
- // @ts-expect-error 'error' does not exist on type 'DeleteResponse'
const deleteIndexNotFound = body.error && body.error.type === 'index_not_found_exception';
if (deleteDocNotFound || deleteIndexNotFound) {
// see "404s from missing index" above
@@ -897,7 +896,7 @@ export class SavedObjectsRepository {
per_page: perPage,
total: body.hits.total,
saved_objects: body.hits.hits.map(
- (hit: estypes.Hit): SavedObjectsFindResult => ({
+ (hit: estypes.SearchHit): SavedObjectsFindResult => ({
// @ts-expect-error @elastic/elasticsearch declared Id as string | number
...this._rawToSavedObject(hit),
score: hit._score!,
@@ -1835,13 +1834,9 @@ export class SavedObjectsRepository {
...(preference ? { preference } : {}),
};
- const { body, statusCode } = await this.client.openPointInTime(
- // @ts-expect-error @elastic/elasticsearch OpenPointInTimeRequest.index expected to accept string[]
- esOptions,
- {
- ignore: [404],
- }
- );
+ const { body, statusCode } = await this.client.openPointInTime(esOptions, {
+ ignore: [404],
+ });
if (statusCode === 404) {
throw SavedObjectsErrorHelpers.createGenericNotFoundError();
}
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
index 64b3dd428fb8..3196a59ca39e 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
@@ -26,7 +26,7 @@ interface GetSearchDslOptions {
rootSearchFields?: string[];
searchAfter?: estypes.Id[];
sortField?: string;
- sortOrder?: estypes.SortOrder;
+ sortOrder?: estypes.SearchSortOrder;
namespaces?: string[];
pit?: SavedObjectsPitParams;
typeToNamespacesMap?: Map;
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
index 1376f0d50a9d..e2a21cc03ce3 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
@@ -50,7 +50,7 @@ const MAPPINGS = {
},
},
},
-};
+} as const;
describe('searchDsl/getSortParams', () => {
describe('type, no sortField', () => {
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
index 64849c308f3f..592110a5413e 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
@@ -16,8 +16,8 @@ export function getSortingParams(
mappings: IndexMapping,
type: string | string[],
sortField?: string,
- sortOrder?: estypes.SortOrder
-): { sort?: estypes.SortContainer[] } {
+ sortOrder?: estypes.SearchSortOrder
+): { sort?: estypes.SearchSortContainer[] } {
if (!sortField) {
return {};
}
diff --git a/src/core/server/saved_objects/service/lib/update_objects_spaces.ts b/src/core/server/saved_objects/service/lib/update_objects_spaces.ts
index 079549265385..3131d0240f96 100644
--- a/src/core/server/saved_objects/service/lib/update_objects_spaces.ts
+++ b/src/core/server/saved_objects/service/lib/update_objects_spaces.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import type { BulkOperationContainer, MultiGetOperation } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import intersection from 'lodash/intersection';
import type { ISavedObjectTypeRegistry } from '../../saved_objects_type_registry';
@@ -173,7 +173,7 @@ export async function updateObjectsSpaces({
};
});
- const bulkGetDocs = expectedBulkGetResults.reduce((acc, x) => {
+ const bulkGetDocs = expectedBulkGetResults.reduce((acc, x) => {
if (isRight(x) && x.value.esRequestIndex !== undefined) {
acc.push({
_id: serializer.generateRawId(undefined, x.value.type, x.value.id),
@@ -192,7 +192,7 @@ export async function updateObjectsSpaces({
const time = new Date().toISOString();
let bulkOperationRequestIndexCounter = 0;
- const bulkOperationParams: BulkOperationContainer[] = [];
+ const bulkOperationParams: estypes.BulkOperationContainer[] = [];
const expectedBulkOperationResults: Either[] = expectedBulkGetResults.map(
(expectedBulkGetResult) => {
if (isLeft(expectedBulkGetResult)) {
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index d3bfdcc6923d..964ba671b596 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -80,7 +80,7 @@ export interface SavedObjectsFindOptions {
page?: number;
perPage?: number;
sortField?: string;
- sortOrder?: estypes.SortOrder;
+ sortOrder?: estypes.SearchSortOrder;
/**
* An array of fields to include in the results
* @example
@@ -137,7 +137,7 @@ export interface SavedObjectsFindOptions {
*
* @alpha
*/
- aggs?: Record;
+ aggs?: Record;
namespaces?: string[];
/**
* This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 379e4147ae02..acec03902bf6 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2361,38 +2361,6 @@ export interface SavedObjectsCollectMultiNamespaceReferencesResponse {
objects: SavedObjectReferenceWithContext[];
}
-// @public
-export interface SavedObjectsComplexFieldMapping {
- // (undocumented)
- doc_values?: boolean;
- dynamic?: false | 'strict';
- // (undocumented)
- enabled?: boolean;
- // (undocumented)
- properties: SavedObjectsMappingProperties;
- // (undocumented)
- type?: string;
-}
-
-// @public
-export interface SavedObjectsCoreFieldMapping {
- // (undocumented)
- doc_values?: boolean;
- // (undocumented)
- fields?: {
- [subfield: string]: {
- type: string;
- ignore_above?: number;
- };
- };
- // (undocumented)
- index?: boolean;
- // (undocumented)
- null_value?: number | boolean | string;
- // (undocumented)
- type: string;
-}
-
// @public (undocumented)
export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
coreMigrationVersion?: string;
@@ -2554,12 +2522,14 @@ export interface SavedObjectsExportTransformContext {
}
// @public
-export type SavedObjectsFieldMapping = SavedObjectsCoreFieldMapping | SavedObjectsComplexFieldMapping;
+export type SavedObjectsFieldMapping = estypes.MappingProperty & {
+ dynamic?: false | 'strict';
+};
// @public (undocumented)
export interface SavedObjectsFindOptions {
// @alpha
- aggs?: Record;
+ aggs?: Record;
defaultSearchOperator?: 'AND' | 'OR';
fields?: string[];
// Warning: (ae-forgotten-export) The symbol "KueryNode" needs to be exported by the entry point index.d.ts
@@ -2583,7 +2553,7 @@ export interface SavedObjectsFindOptions {
// (undocumented)
sortField?: string;
// (undocumented)
- sortOrder?: estypes.SortOrder;
+ sortOrder?: estypes.SearchSortOrder;
// (undocumented)
type: string | string[];
typeToNamespacesMap?: Map;
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts
index 2a7f2458a27d..85562435e68d 100644
--- a/src/plugins/data/common/es_query/filters/phrase_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.ts
@@ -5,7 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
import { get, isPlainObject } from 'lodash';
import { Filter, FilterMeta } from './meta_filter';
import { IIndexPattern, IFieldType } from '../../index_patterns';
@@ -23,7 +23,7 @@ export type PhraseFilter = Filter & {
script?: {
script: {
source?: any;
- lang?: string;
+ lang?: estypes.ScriptLanguage;
params: any;
};
};
diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts
index fb8426655583..a082b93c0a79 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.ts
@@ -5,7 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
import { map, reduce, mapValues, get, keys, pickBy } from 'lodash';
import { Filter, FilterMeta } from './meta_filter';
import { IIndexPattern, IFieldType } from '../../index_patterns';
@@ -63,7 +63,7 @@ export type RangeFilter = Filter &
script?: {
script: {
params: any;
- lang: string;
+ lang: estypes.ScriptLanguage;
source: any;
};
};
diff --git a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
index 6b1d01e5ba14..681aba41a609 100644
--- a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
+++ b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
@@ -16,7 +16,7 @@ Object {
"esTypes": Array [
"keyword",
],
- "lang": "lang",
+ "lang": "java",
"name": "name",
"readFromDocValues": false,
"script": "script",
@@ -58,7 +58,7 @@ Object {
},
},
"isMapped": undefined,
- "lang": "lang",
+ "lang": "java",
"name": "name",
"readFromDocValues": false,
"runtimeField": Object {
diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
index 48342a9e02a2..73f015ca5517 100644
--- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
@@ -24,7 +24,7 @@ describe('Field', function () {
name: 'name',
type: 'string',
script: 'script',
- lang: 'lang',
+ lang: 'java' as const,
count: 1,
esTypes: ['text'], // note, this will get replaced by the runtime field type
aggregatable: true,
diff --git a/src/plugins/data/common/index_patterns/fields/types.ts b/src/plugins/data/common/index_patterns/fields/types.ts
index 565dd6d92694..0fb7a46c2cf7 100644
--- a/src/plugins/data/common/index_patterns/fields/types.ts
+++ b/src/plugins/data/common/index_patterns/fields/types.ts
@@ -5,7 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
import { FieldSpec, IFieldSubType, IndexPattern } from '../..';
/**
@@ -16,7 +16,7 @@ export interface IFieldType {
name: string;
type: string;
script?: string;
- lang?: string;
+ lang?: estypes.ScriptLanguage;
count?: number;
// esTypes might be undefined on old index patterns that have not been refreshed since we added
// this prop. It is also undefined on scripted fields.
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index f7aeb9101774..d014e2785bd4 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -5,7 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
import { ToastInputFields, ErrorToastOptions } from 'src/core/public/notifications';
// eslint-disable-next-line
import type { SavedObject } from 'src/core/server';
@@ -178,7 +178,7 @@ export type FieldSpecConflictDescriptions = Record;
export interface FieldSpecExportFmt {
count?: number;
script?: string;
- lang?: string;
+ lang?: estypes.ScriptLanguage;
conflictDescriptions?: FieldSpecConflictDescriptions;
name: string;
type: KBN_FIELD_TYPES;
@@ -208,7 +208,7 @@ export interface FieldSpec {
* Scripted field langauge
* Painless is the only valid scripted field language
*/
- lang?: string;
+ lang?: estypes.ScriptLanguage;
conflictDescriptions?: Record;
format?: SerializedFieldFormat;
name: string;
diff --git a/src/plugins/data/common/search/aggs/agg_configs.ts b/src/plugins/data/common/search/aggs/agg_configs.ts
index 6f8a8d38a4a2..8593a0b0ed0f 100644
--- a/src/plugins/data/common/search/aggs/agg_configs.ts
+++ b/src/plugins/data/common/search/aggs/agg_configs.ts
@@ -10,7 +10,7 @@ import moment from 'moment';
import _, { cloneDeep } from 'lodash';
import { i18n } from '@kbn/i18n';
import { Assign } from '@kbn/utility-types';
-import { Aggregate, Bucket } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import {
IEsSearchResponse,
@@ -57,7 +57,9 @@ export interface AggConfigsOptions {
export type CreateAggConfigParams = Assign;
-export type GenericBucket = Bucket & { [property: string]: Aggregate };
+export type GenericBucket = estypes.AggregationsBucket & {
+ [property: string]: estypes.AggregationsAggregate;
+};
/**
* @name AggConfigs
@@ -412,7 +414,7 @@ export class AggConfigs {
const transformedRawResponse = cloneDeep(response.rawResponse);
if (!transformedRawResponse.aggregations) {
transformedRawResponse.aggregations = {
- doc_count: response.rawResponse.hits?.total as Aggregate,
+ doc_count: response.rawResponse.hits?.total as estypes.AggregationsAggregate,
};
}
const aggCursor = transformedRawResponse.aggregations!;
diff --git a/src/plugins/data/common/search/aggs/utils/time_splits.ts b/src/plugins/data/common/search/aggs/utils/time_splits.ts
index 4ac47efaea34..75c1c091e075 100644
--- a/src/plugins/data/common/search/aggs/utils/time_splits.ts
+++ b/src/plugins/data/common/search/aggs/utils/time_splits.ts
@@ -8,12 +8,7 @@
import moment from 'moment';
import _, { isArray } from 'lodash';
-import {
- Aggregate,
- FiltersAggregate,
- FiltersBucketItem,
- MultiBucketAggregate,
-} from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { AggGroupNames } from '../agg_groups';
import { GenericBucket, AggConfigs, getTime, AggConfig } from '../../../../common';
@@ -156,12 +151,15 @@ import { IBucketAggConfig } from '../buckets';
}
// ...
* ```
- *
- *
+ *
+ *
* @param aggConfigs The agg configs instance
* @param aggCursor The root aggregations object from the response which will be mutated in place
*/
-export function mergeTimeShifts(aggConfigs: AggConfigs, aggCursor: Record) {
+export function mergeTimeShifts(
+ aggConfigs: AggConfigs,
+ aggCursor: Record
+) {
const timeShifts = aggConfigs.getTimeShifts();
const hasMultipleTimeShifts = Object.keys(timeShifts).length > 1;
const requestAggs = aggConfigs.getRequestAggs();
@@ -200,7 +198,7 @@ export function mergeTimeShifts(aggConfigs: AggConfigs, aggCursor: Record
@@ -212,7 +210,7 @@ export function mergeTimeShifts(aggConfigs: AggConfigs, aggCursor: Record bucketAgg.type.orderBuckets(bucketAgg, a, b));
} else if (baseBuckets && buckets && !isArray(baseBuckets)) {
@@ -249,7 +247,10 @@ export function mergeTimeShifts(aggConfigs: AggConfigs, aggCursor: Record, aggIndex: number): undefined => {
+ const transformTimeShift = (
+ cursor: Record,
+ aggIndex: number
+ ): undefined => {
const shouldSplit = aggConfigs.aggs[aggIndex].type.splitForTimeShift(
aggConfigs.aggs[aggIndex],
aggConfigs
@@ -257,10 +258,8 @@ export function mergeTimeShifts(aggConfigs: AggConfigs, aggCursor: Record;
+ const timeShiftedBuckets = (cursor.time_offset_split as estypes.AggregationsFiltersAggregate)
+ .buckets as Record;
const subTree = {};
Object.entries(timeShifts).forEach(([key, shift]) => {
mergeAggLevel(
@@ -301,7 +300,7 @@ export function mergeTimeShifts(aggConfigs: AggConfigs, aggCursor: Record {
querySuggestionsArgs,
mockKueryNode({ prefix, suffix })
);
+ // @ts-expect-error indexPatternResponse is not properly typed json
const filterableFields = indexPatternResponse.fields.filter(indexPatternsUtils.isFilterable);
expect(suggestions.length).toBe(filterableFields.length);
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 434785839408..d1258cdb84ca 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -7,13 +7,11 @@
import { $Values } from '@kbn/utility-types';
import { Action } from 'history';
import { Adapters as Adapters_2 } from 'src/plugins/inspector/common';
-import { Aggregate } from '@elastic/elasticsearch/api/types';
import { ApiResponse } from '@elastic/elasticsearch/lib/Transport';
import { ApplicationStart } from 'kibana/public';
import { Assign } from '@kbn/utility-types';
import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
import Boom from '@hapi/boom';
-import { Bucket } from '@elastic/elasticsearch/api/types';
import { ConfigDeprecationProvider } from '@kbn/config';
import { CoreSetup } from 'src/core/public';
import { CoreSetup as CoreSetup_2 } from 'kibana/public';
@@ -1245,7 +1243,7 @@ export interface IFieldType {
// (undocumented)
format?: any;
// (undocumented)
- lang?: string;
+ lang?: estypes.ScriptLanguage;
// (undocumented)
name: string;
// (undocumented)
@@ -1378,16 +1376,12 @@ export class IndexPattern implements IIndexPattern {
};
// (undocumented)
getAggregationRestrictions(): Record> | undefined;
getAsSavedObjectBody(): IndexPatternAttributes;
// (undocumented)
@@ -1530,8 +1524,8 @@ export class IndexPatternField implements IFieldType {
// (undocumented)
get filterable(): boolean;
get isMapped(): boolean | undefined;
- get lang(): string | undefined;
- set lang(lang: string | undefined);
+ get lang(): "painless" | "expression" | "mustache" | "java" | undefined;
+ set lang(lang: "painless" | "expression" | "mustache" | "java" | undefined);
// (undocumented)
get name(): string;
// (undocumented)
@@ -1555,7 +1549,7 @@ export class IndexPatternField implements IFieldType {
toJSON(): {
count: number;
script: string | undefined;
- lang: string | undefined;
+ lang: "painless" | "expression" | "mustache" | "java" | undefined;
conflictDescriptions: Record | undefined;
name: string;
type: string;
@@ -2002,7 +1996,7 @@ export type PhraseFilter = Filter & {
script?: {
script: {
source?: any;
- lang?: string;
+ lang?: estypes.ScriptLanguage;
params: any;
};
};
@@ -2220,7 +2214,7 @@ export type RangeFilter = Filter & EsRangeFilter & {
script?: {
script: {
params: any;
- lang: string;
+ lang: estypes.ScriptLanguage;
source: any;
};
};
@@ -2266,7 +2260,7 @@ export interface Reason {
reason: string;
};
// (undocumented)
- lang?: string;
+ lang?: estypes.ScriptLanguage;
// (undocumented)
position?: {
offset: number;
diff --git a/src/plugins/data/public/search/errors/painless_error.test.tsx b/src/plugins/data/public/search/errors/painless_error.test.tsx
index f07f078ea03a..833573786594 100644
--- a/src/plugins/data/public/search/errors/painless_error.test.tsx
+++ b/src/plugins/data/public/search/errors/painless_error.test.tsx
@@ -23,6 +23,7 @@ describe('PainlessError', () => {
const e = new PainlessError({
statusCode: 400,
message: 'search_phase_execution_exception',
+ // @ts-expect-error searchPhaseException is not properly typed json
attributes: searchPhaseException.error,
});
const component = mount(e.getErrorMessage(startMock.application));
diff --git a/src/plugins/data/public/search/errors/types.ts b/src/plugins/data/public/search/errors/types.ts
index 445293fe47ea..13c5d0c242ed 100644
--- a/src/plugins/data/public/search/errors/types.ts
+++ b/src/plugins/data/public/search/errors/types.ts
@@ -5,7 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
import { KibanaServerError } from '../../../../kibana_utils/common';
export interface FailedShard {
@@ -24,7 +24,7 @@ export interface Reason {
start: number;
end: number;
};
- lang?: string;
+ lang?: estypes.ScriptLanguage;
script?: string;
caused_by?: {
type: string;
diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
index dfbc912453d6..fe66d4b6e993 100644
--- a/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
@@ -135,6 +135,7 @@ describe('SearchInterceptor', () => {
new PainlessError({
statusCode: 400,
message: 'search_phase_execution_exception',
+ // @ts-expect-error searchPhaseException is not properly typed json
attributes: searchPhaseException.error,
})
);
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts
index c34a47dc1c6d..83e4abf55d52 100644
--- a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts
+++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts
@@ -5,7 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
export interface ShardFailureRequest {
docvalue_fields: string[];
_source: unknown;
@@ -24,7 +24,7 @@ export interface ShardFailure {
type: string;
};
reason: string;
- lang?: string;
+ lang?: estypes.ScriptLanguage;
script?: string;
script_stack?: string[];
type: string;
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
index 5917f8009c47..7c5d5ccff29e 100644
--- a/src/plugins/data/server/autocomplete/value_suggestions_route.ts
+++ b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -78,7 +78,7 @@ async function getBody(
{ timeout, terminate_after }: Record,
field: IFieldType | string,
query: string,
- filters: estypes.QueryContainer[] = []
+ filters: estypes.QueryDslQueryContainer[] = []
) {
const isFieldObject = (f: any): f is IFieldType => Boolean(f && f.name);
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
index c4c1ffa3cf9f..6db9254b8152 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -69,7 +69,7 @@ import { FieldDescriptor } from '../../../fetcher';
* @return {Array}
*/
export function readFieldCapsResponse(
- fieldCapsResponse: estypes.FieldCapabilitiesResponse
+ fieldCapsResponse: estypes.FieldCapsResponse
): FieldDescriptor[] {
const capsByNameThenType = fieldCapsResponse.fields;
diff --git a/src/plugins/data/server/search/routes/call_msearch.ts b/src/plugins/data/server/search/routes/call_msearch.ts
index 0c238adf831b..4a7db9517c68 100644
--- a/src/plugins/data/server/search/routes/call_msearch.ts
+++ b/src/plugins/data/server/search/routes/call_msearch.ts
@@ -8,7 +8,8 @@
import { Observable } from 'rxjs';
import { first } from 'rxjs/operators';
-import { IUiSettingsClient, IScopedClusterClient, SharedGlobalConfig } from 'src/core/server';
+import type { IUiSettingsClient, IScopedClusterClient, SharedGlobalConfig } from 'src/core/server';
+import type { estypes } from '@elastic/elasticsearch';
import type { MsearchRequestBody, MsearchResponse } from '../../../common/search/search_source';
import { getKbnServerError } from '../../../../kibana_utils/server';
@@ -78,7 +79,9 @@ export function getCallMsearch(dependencies: CallMsearchDependencies) {
body: {
...response,
body: {
- responses: response.body.responses?.map((r) => shimHitsTotal(r)),
+ responses: response.body.responses?.map((r) =>
+ shimHitsTotal(r as estypes.SearchResponse)
+ ),
},
},
};
diff --git a/src/plugins/data/server/search/routes/msearch.test.ts b/src/plugins/data/server/search/routes/msearch.test.ts
index 6ae8612cceb1..303f83582f73 100644
--- a/src/plugins/data/server/search/routes/msearch.test.ts
+++ b/src/plugins/data/server/search/routes/msearch.test.ts
@@ -116,7 +116,7 @@ describe('msearch route', () => {
const error: any = mockResponse.customError.mock.calls[0][0];
expect(error.statusCode).toBe(400);
- expect(error.body.message).toBe('json_e_o_f_exception');
+ expect(error.body.message).toMatch(/json_e_o_f_exception/);
expect(error.body.attributes).toBe(jsonEofException.error);
});
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
index 0e3acedfe12f..91de0fca3674 100644
--- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
@@ -54,7 +54,8 @@ export const eqlSearchStrategyProvider = (
};
const promise = id
? client.get({ ...params, id }, request.options)
- : client.search(params as EqlSearchStrategyRequest['params'], request.options);
+ : // @ts-expect-error EqlRequestParams | undefined is not assignable to EqlRequestParams
+ client.search(params as EqlSearchStrategyRequest['params'], request.options);
const response = await shimAbortSignal(promise, options.abortSignal);
return toEqlKibanaSearchResponse(response as ApiResponse);
};
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
index 216318339622..56b26a7ebe02 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
@@ -293,7 +293,7 @@ describe('ES search strategy', () => {
expect(mockGetCaller).toBeCalled();
const request = mockGetCaller.mock.calls[0][0];
- expect(request).toEqual({ id, body: { keep_alive: keepAlive } });
+ expect(request).toEqual({ id, keep_alive: keepAlive });
});
it('throws normalized error on ElasticsearchClientError', async () => {
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
index ab6162f756ea..d6af00ada80f 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -177,7 +177,7 @@ export const enhancedEsSearchStrategyProvider = (
const client = useInternalUser ? esClient.asInternalUser : esClient.asCurrentUser;
await client.asyncSearch.get({
id,
- body: { keep_alive: keepAlive },
+ keep_alive: keepAlive,
});
} catch (e) {
throw getKbnServerError(e);
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 694963534cf4..f1feee03e95c 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -6,10 +6,8 @@
import { $Values } from '@kbn/utility-types';
import { Adapters } from 'src/plugins/inspector/common';
-import { Aggregate } from '@elastic/elasticsearch/api/types';
import { Assign } from '@kbn/utility-types';
import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import { Bucket } from '@elastic/elasticsearch/api/types';
import { ConfigDeprecationProvider } from '@kbn/config';
import { CoreSetup } from 'src/core/server';
import { CoreSetup as CoreSetup_2 } from 'kibana/server';
@@ -713,7 +711,7 @@ export interface IFieldType {
// (undocumented)
format?: any;
// (undocumented)
- lang?: string;
+ lang?: estypes.ScriptLanguage;
// (undocumented)
name: string;
// (undocumented)
@@ -777,16 +775,12 @@ export class IndexPattern implements IIndexPattern {
};
// (undocumented)
getAggregationRestrictions(): Record> | undefined;
getAsSavedObjectBody(): IndexPatternAttributes;
// (undocumented)
@@ -1430,22 +1424,22 @@ export const shimAbortSignal: (promise: TransportRequestPromise, signal?:
export function shimHitsTotal(response: estypes.SearchResponse, { legacyHitsTotal }?: ISearchOptions): {
hits: {
total: any;
- hits: estypes.Hit[];
+ hits: estypes.SearchHit[];
max_score?: number | undefined;
};
took: number;
timed_out: boolean;
_shards: estypes.ShardStatistics;
- aggregations?: Record | undefined;
+ aggregations?: Record | undefined;
_clusters?: estypes.ClusterStatistics | undefined;
documents?: unknown[] | undefined;
fields?: Record | undefined;
max_score?: number | undefined;
num_reduce_phases?: number | undefined;
- profile?: estypes.Profile | undefined;
+ profile?: estypes.SearchProfile | undefined;
pit_id?: string | undefined;
_scroll_id?: string | undefined;
- suggest?: Record[]> | undefined;
+ suggest?: Record[]> | undefined;
terminated_early?: boolean | undefined;
};
diff --git a/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx b/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx
index 1135d79b6b69..681418c1bd7c 100644
--- a/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx
+++ b/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx
@@ -21,7 +21,7 @@ export interface DocTableLegacyProps {
searchDescription?: string;
searchTitle?: string;
onFilter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
- rows: estypes.Hit[];
+ rows: estypes.SearchHit[];
indexPattern: IIndexPattern;
minimumVisibleRows?: number;
onAddColumn?: (column: string) => void;
diff --git a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
index 6b8e912bbffb..7a3320d43c8b 100644
--- a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
+++ b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
@@ -33,7 +33,7 @@ export function buildSearchBody(
useNewFieldsApi: boolean
): RequestBody | undefined {
const computedFields = indexPattern.getComputedFields();
- const runtimeFields = computedFields.runtimeFields as estypes.RuntimeFields;
+ const runtimeFields = computedFields.runtimeFields as estypes.MappingRuntimeFields;
const request: RequestBody = {
body: {
query: {
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx
index 96f78a088fff..bacab18d2850 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx
@@ -15,6 +15,7 @@ describe('DeleteScritpedFieldConfirmationModal', () => {
test('should render normally', () => {
const component = shallow(
{}}
hideDeleteConfirmationModal={() => {}}
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
index 83ac96f6c169..5a9f4eb87118 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
@@ -15,6 +15,7 @@ import { IIndexPattern } from 'src/plugins/data/public';
const getIndexPatternMock = (mockedFields: any = {}) => ({ ...mockedFields } as IIndexPattern);
+// @ts-expect-error invalid lang type
const items: ScriptedFieldItem[] = [{ name: '1', lang: 'Elastic', script: '' }];
describe('Table', () => {
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
index 08a5f2272362..e6aa87172ca0 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
@@ -155,6 +155,7 @@ describe('ScriptedFieldsTable', () => {
);
await component.update(); // Fire `componentWillMount()`
+ // @ts-expect-error lang is not valid
component.instance().startDeleteField({ name: 'ScriptedField', lang: '', script: '' });
await component.update();
@@ -179,6 +180,7 @@ describe('ScriptedFieldsTable', () => {
);
await component.update(); // Fire `componentWillMount()`
+ // @ts-expect-error lang is not valid
component.instance().startDeleteField({ name: 'ScriptedField', lang: '', script: '' });
await component.update();
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
index 77ba2f734d3f..7fd5170b669f 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
@@ -65,7 +65,7 @@ export class ScriptedFieldsTable extends Component<
const supportedLangs = getSupportedScriptingLanguages();
for (const field of fields) {
- const lang: string = field.lang;
+ const lang = field.lang;
if (deprecatedLangs.includes(lang) || !supportedLangs.includes(lang)) {
deprecatedLangsInUse.push(lang);
}
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/types.ts b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/types.ts
index 3348f5eb052e..5c6adc824d22 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/types.ts
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/types.ts
@@ -5,10 +5,10 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
/** @internal **/
export interface ScriptedFieldItem {
name: string;
- lang: string;
+ lang: estypes.ScriptLanguage;
script: string;
}
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
index f0da57a5f9b6..b05ddaed064c 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
@@ -5,7 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
import React, { PureComponent, Fragment } from 'react';
import { intersection, union, get } from 'lodash';
@@ -100,7 +100,7 @@ export interface FieldEditorState {
isReady: boolean;
isCreating: boolean;
isDeprecatedLang: boolean;
- scriptingLangs: string[];
+ scriptingLangs: estypes.ScriptLanguage[];
fieldTypes: string[];
fieldTypeFormats: FieldTypeFormat[];
existingFieldNames: string[];
@@ -131,8 +131,8 @@ export class FieldEditor extends PureComponent {
+ onLangChange = (lang: estypes.ScriptLanguage) => {
const { spec } = this.state;
const fieldTypes = get(FIELD_TYPES_BY_LANG, lang, DEFAULT_FIELD_TYPES);
spec.lang = lang;
@@ -373,7 +374,7 @@ export class FieldEditor extends PureComponent {
- this.onLangChange(e.target.value);
+ this.onLangChange(e.target.value as estypes.ScriptLanguage);
}}
/>
diff --git a/src/plugins/index_pattern_management/public/scripting_languages/index.ts b/src/plugins/index_pattern_management/public/scripting_languages/index.ts
index c6b2f3c4b6b2..aeb38c8172be 100644
--- a/src/plugins/index_pattern_management/public/scripting_languages/index.ts
+++ b/src/plugins/index_pattern_management/public/scripting_languages/index.ts
@@ -5,15 +5,15 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { estypes } from '@elastic/elasticsearch';
import { i18n } from '@kbn/i18n';
import { HttpStart, NotificationsStart } from 'src/core/public';
-export function getSupportedScriptingLanguages(): string[] {
+export function getSupportedScriptingLanguages(): estypes.ScriptLanguage[] {
return ['painless'];
}
-export function getDeprecatedScriptingLanguages(): string[] {
+export function getDeprecatedScriptingLanguages(): estypes.ScriptLanguage[] {
return [];
}
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
index 7fd6ca4080d6..bacfa5e77107 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
@@ -188,7 +188,7 @@ describe('get_local_stats', () => {
describe('handleLocalStats', () => {
it('returns expected object without xpack or kibana data', () => {
const result = handleLocalStats(
- clusterInfo as estypes.RootNodeInfoResponse,
+ clusterInfo as estypes.InfoResponse,
clusterStatsWithNodesUsage,
void 0,
void 0,
@@ -205,7 +205,7 @@ describe('get_local_stats', () => {
it('returns expected object with xpack', () => {
const result = handleLocalStats(
- clusterInfo as estypes.RootNodeInfoResponse,
+ clusterInfo as estypes.InfoResponse,
clusterStatsWithNodesUsage,
void 0,
void 0,
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
index 7fdcb50b704a..7860949e098a 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
@@ -28,7 +28,7 @@ import { getDataTelemetry, DATA_TELEMETRY_ID, DataTelemetryPayload } from './get
*/
export function handleLocalStats(
// eslint-disable-next-line @typescript-eslint/naming-convention
- { cluster_name, cluster_uuid, version }: estypes.RootNodeInfoResponse,
+ { cluster_name, cluster_uuid, version }: estypes.InfoResponse,
{ _nodes, cluster_name: clusterName, ...clusterStats }: ClusterStats,
kibana: KibanaUsageStats | undefined,
dataTelemetry: DataTelemetryPayload | undefined,
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
index c35b8a3d2449..0d58d80ed596 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
@@ -14,7 +14,7 @@ import { TIMEOUT } from './constants';
* Data returned by GET /_nodes/usage, but flattened as an array of {@link estypes.NodeUsageInformation}
* with the node ID set in the field `node_id`.
*/
-export interface NodeUsage extends estypes.NodeUsageInformation {
+export interface NodeUsage extends estypes.NodesUsageNodeUsage {
/**
* The Node ID as reported by ES
*/
diff --git a/src/plugins/vis_type_timeseries/common/fields_utils.test.ts b/src/plugins/vis_type_timeseries/common/fields_utils.test.ts
index 9550697e2285..f056c38b0c0c 100644
--- a/src/plugins/vis_type_timeseries/common/fields_utils.test.ts
+++ b/src/plugins/vis_type_timeseries/common/fields_utils.test.ts
@@ -12,7 +12,7 @@ import type { FieldSpec } from '../../data/common';
describe('fields_utils', () => {
describe('toSanitizedFieldType', () => {
const mockedField = {
- lang: 'lang',
+ lang: 'painless',
conflictDescriptions: {},
aggregatable: true,
name: 'name',
diff --git a/src/plugins/vis_type_vega/public/data_model/types.ts b/src/plugins/vis_type_vega/public/data_model/types.ts
index 255bd9774f9d..9e3cf0a5421c 100644
--- a/src/plugins/vis_type_vega/public/data_model/types.ts
+++ b/src/plugins/vis_type_vega/public/data_model/types.ts
@@ -17,7 +17,7 @@ import { EmsFileParser } from './ems_file_parser';
import { UrlParser } from './url_parser';
interface Body {
- aggs?: Record;
+ aggs?: Record;
query?: Query;
timeout?: string;
}
diff --git a/test/api_integration/apis/saved_objects/migrations.ts b/test/api_integration/apis/saved_objects/migrations.ts
index d009a66e9df5..0877998ca6c1 100644
--- a/test/api_integration/apis/saved_objects/migrations.ts
+++ b/test/api_integration/apis/saved_objects/migrations.ts
@@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => {
const mappingProperties = {
foo: { properties: { name: { type: 'text' } } },
bar: { properties: { mynum: { type: 'integer' } } },
- };
+ } as const;
const savedObjectTypes: SavedObjectsType[] = [
{
@@ -221,7 +221,7 @@ export default ({ getService }: FtrProviderContext) => {
const mappingProperties = {
foo: { properties: { name: { type: 'text' } } },
bar: { properties: { mynum: { type: 'integer' } } },
- };
+ } as const;
let savedObjectTypes: SavedObjectsType[] = [
{
@@ -357,7 +357,7 @@ export default ({ getService }: FtrProviderContext) => {
const mappingProperties = {
'fleet-agent-event': { properties: { name: { type: 'text' } } },
bar: { properties: { mynum: { type: 'integer' } } },
- };
+ } as const;
let savedObjectTypes: SavedObjectsType[] = [
FLEET_AGENT_EVENT_TYPE,
@@ -417,7 +417,7 @@ export default ({ getService }: FtrProviderContext) => {
const mappingProperties = {
foo: { properties: { name: { type: 'text' } } },
- };
+ } as const;
const savedObjectTypes: SavedObjectsType[] = [
{
@@ -510,7 +510,7 @@ export default ({ getService }: FtrProviderContext) => {
foo: { properties: { name: { type: 'text' } } },
bar: { properties: { nomnom: { type: 'integer' } } },
baz: { properties: { title: { type: 'keyword' } } },
- };
+ } as const;
const savedObjectTypes: SavedObjectsType[] = [
{
@@ -677,7 +677,7 @@ async function createIndex({
coreMigrationVersion: {
type: 'keyword',
},
- };
+ } as const;
await esClient.indices.create({
index,
body: { mappings: { dynamic: 'strict', properties } },
diff --git a/test/api_integration/apis/search/verify_error.ts b/test/api_integration/apis/search/verify_error.ts
index d6b729f59d8d..1973fe4e4ab3 100644
--- a/test/api_integration/apis/search/verify_error.ts
+++ b/test/api_integration/apis/search/verify_error.ts
@@ -16,7 +16,7 @@ export const verifyErrorResponse = (
) => {
expect(r.statusCode).to.be(expectedCode);
if (message) {
- expect(r.message).to.be(message);
+ expect(r.message).to.include.string(message);
}
if (shouldHaveAttrs) {
expect(r).to.have.property('attributes');
diff --git a/typings/elasticsearch/index.d.ts b/typings/elasticsearch/index.d.ts
index 7eaf762d353a..1951434890c5 100644
--- a/typings/elasticsearch/index.d.ts
+++ b/typings/elasticsearch/index.d.ts
@@ -8,9 +8,9 @@
import { estypes } from '@elastic/elasticsearch';
import { InferSearchResponseOf, AggregateOf as AggregationResultOf, SearchHit } from './search';
-export type ESFilter = estypes.QueryContainer;
+export type ESFilter = estypes.QueryDslQueryContainer;
export type ESSearchRequest = estypes.SearchRequest;
-export type AggregationOptionsByType = Required;
+export type AggregationOptionsByType = Required;
// Typings for Elasticsearch queries and aggregations. These are intended to be
// moved to the Elasticsearch JS client at some point (see #77720.)
diff --git a/typings/elasticsearch/search.d.ts b/typings/elasticsearch/search.d.ts
index d75f31d38817..36a684fb097a 100644
--- a/typings/elasticsearch/search.d.ts
+++ b/typings/elasticsearch/search.d.ts
@@ -28,14 +28,14 @@ type KeysOfSources = T extends [infer U, ...infer V]
: {};
type CompositeKeysOf<
- TAggregationContainer extends estypes.AggregationContainer
+ TAggregationContainer extends estypes.AggregationsAggregationContainer
> = TAggregationContainer extends {
composite: { sources: [...infer TSource] };
}
? KeysOfSources
: unknown;
-type Source = estypes.SourceFilter | boolean | estypes.Fields;
+type Source = estypes.SearchSourceFilter | boolean | estypes.Fields;
type ValueTypeOfField = T extends Record
? ValuesType
@@ -50,13 +50,13 @@ type ValueTypeOfField = T extends Record
type MaybeArray = T | T[];
type Fields = Exclude['body']['fields'], undefined>;
-type DocValueFields = MaybeArray;
+type DocValueFields = MaybeArray;
export type SearchHit<
TSource extends any = unknown,
TFields extends Fields | undefined = undefined,
TDocValueFields extends DocValueFields | undefined = undefined
-> = Omit &
+> = Omit &
(TSource extends false ? {} : { _source: TSource }) &
(TFields extends Fields
? {
@@ -82,11 +82,17 @@ type HitsOf<
>
>;
-type AggregationTypeName = Exclude;
+type AggregationTypeName = Exclude<
+ keyof estypes.AggregationsAggregationContainer,
+ 'aggs' | 'aggregations'
+>;
-type AggregationMap = Partial>;
+type AggregationMap = Partial>;
-type TopLevelAggregationRequest = Pick;
+type TopLevelAggregationRequest = Pick<
+ estypes.AggregationsAggregationContainer,
+ 'aggs' | 'aggregations'
+>;
type MaybeKeyed<
TAggregationContainer,
@@ -97,7 +103,7 @@ type MaybeKeyed<
: { buckets: TBucket[] };
export type AggregateOf<
- TAggregationContainer extends estypes.AggregationContainer,
+ TAggregationContainer extends estypes.AggregationsAggregationContainer,
TDocument
> = (Record & {
adjacency_matrix: {
@@ -518,9 +524,9 @@ export type AggregateOf<
relation: 'eq' | 'gte';
};
max_score: number | null;
- hits: TAggregationContainer extends { top_hits: estypes.TopHitsAggregation }
+ hits: TAggregationContainer extends { top_hits: estypes.AggregationsTopHitsAggregation }
? HitsOf
- : estypes.HitsMetadata;
+ : estypes.SearchHitsMetadata;
};
};
top_metrics: {
@@ -542,7 +548,7 @@ export type AggregateOf<
})[ValidAggregationKeysOf & AggregationTypeName];
type AggregateOfMap = {
- [TAggregationName in keyof TAggregationMap]: TAggregationMap[TAggregationName] extends estypes.AggregationContainer
+ [TAggregationName in keyof TAggregationMap]: TAggregationMap[TAggregationName] extends estypes.AggregationsAggregationContainer
? AggregateOf
: never; // using never means we effectively ignore optional keys, using {} creates a union type of { ... } | {}
};
diff --git a/x-pack/plugins/actions/server/actions_client.ts b/x-pack/plugins/actions/server/actions_client.ts
index c655141415b5..449d218ed5ae 100644
--- a/x-pack/plugins/actions/server/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client.ts
@@ -515,7 +515,7 @@ async function injectExtraFindData(
scopedClusterClient: IScopedClusterClient,
actionResults: ActionResult[]
): Promise {
- const aggs: Record = {};
+ const aggs: Record = {};
for (const actionResult of actionResults) {
aggs[actionResult.id] = {
filter: {
diff --git a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
index fe9874fb1d67..28b904361e67 100644
--- a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
+++ b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
@@ -56,6 +56,7 @@ async function createIndexTemplate({
await client.indices.putIndexTemplate({
name: templateName,
body: template,
+ // @ts-expect-error doesn't exist in @elastic/elasticsearch
create: true,
});
} catch (err) {
diff --git a/x-pack/plugins/actions/server/saved_objects/index.ts b/x-pack/plugins/actions/server/saved_objects/index.ts
index 9360bc919a2d..9d8c36400795 100644
--- a/x-pack/plugins/actions/server/saved_objects/index.ts
+++ b/x-pack/plugins/actions/server/saved_objects/index.ts
@@ -5,10 +5,11 @@
* 2.0.
*/
-import {
+import type {
SavedObject,
SavedObjectsExportTransformContext,
SavedObjectsServiceSetup,
+ SavedObjectsTypeMappingDefinition,
} from 'kibana/server';
import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
import mappings from './mappings.json';
@@ -31,7 +32,7 @@ export function setupSavedObjects(
name: ACTION_SAVED_OBJECT_TYPE,
hidden: true,
namespaceType: 'single',
- mappings: mappings.action,
+ mappings: mappings.action as SavedObjectsTypeMappingDefinition,
migrations: getMigrations(encryptedSavedObjects),
management: {
defaultSearchField: 'name',
@@ -67,7 +68,7 @@ export function setupSavedObjects(
name: ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
hidden: true,
namespaceType: 'single',
- mappings: mappings.action_task_params,
+ mappings: mappings.action_task_params as SavedObjectsTypeMappingDefinition,
});
encryptedSavedObjects.registerType({
type: ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts b/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
index b8df0c3d8de0..c81fa7927ef7 100644
--- a/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
+++ b/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
@@ -109,7 +109,7 @@ export interface FindOptions extends IndexType {
defaultSearchOperator?: 'AND' | 'OR';
searchFields?: string[];
sortField?: string;
- sortOrder?: estypes.SortOrder;
+ sortOrder?: estypes.SearchSortOrder;
hasReference?: {
type: string;
id: string;
diff --git a/x-pack/plugins/alerting/server/saved_objects/index.ts b/x-pack/plugins/alerting/server/saved_objects/index.ts
index c339183eeedc..1ad0f972b2ec 100644
--- a/x-pack/plugins/alerting/server/saved_objects/index.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/index.ts
@@ -5,10 +5,11 @@
* 2.0.
*/
-import {
+import type {
SavedObject,
SavedObjectsExportTransformContext,
SavedObjectsServiceSetup,
+ SavedObjectsTypeMappingDefinition,
} from 'kibana/server';
import mappings from './mappings.json';
import { getMigrations } from './migrations';
@@ -51,7 +52,7 @@ export function setupSavedObjects(
hidden: true,
namespaceType: 'single',
migrations: getMigrations(encryptedSavedObjects),
- mappings: mappings.alert,
+ mappings: mappings.alert as SavedObjectsTypeMappingDefinition,
...(config.enableImportExport
? {
management: {
diff --git a/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts b/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
index 7f62fd399806..18cb641bd4e6 100644
--- a/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
+++ b/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
@@ -10,7 +10,7 @@ import { execSync } from 'child_process';
import moment from 'moment';
import path from 'path';
import fs from 'fs';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { getEsClient } from '../shared/get_es_client';
import { parseIndexUrl } from '../shared/parse_index_url';
@@ -117,7 +117,7 @@ async function run() {
const query = {
bool: {
- should: should.map(({ bool }) => ({ bool })) as QueryContainer[],
+ should: should.map(({ bool }) => ({ bool })) as QueryDslQueryContainer[],
minimum_should_match: 1,
},
};
diff --git a/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts b/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts
index 508b9419344c..091982598d6a 100644
--- a/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import {
PROCESSOR_EVENT,
SERVICE_NAME,
@@ -45,7 +45,7 @@ export function getTransactionDurationChartPreview({
: []),
...rangeQuery(start, end),
...environmentQuery(environment),
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
},
};
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
index f77cc3ee930b..3e870eb3e32c 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { take } from 'rxjs/operators';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import {
ALERT_EVALUATION_THRESHOLD,
ALERT_EVALUATION_VALUE,
@@ -109,7 +109,7 @@ export function registerTransactionDurationAlertType({
},
},
...environmentQuery(alertParams.environment),
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
},
},
aggs: {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
index 399fb9a216ef..4cc2324f47b9 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
@@ -8,7 +8,7 @@
import { schema } from '@kbn/config-schema';
import { compact } from 'lodash';
import { ESSearchResponse } from 'typings/elasticsearch';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import {
ALERT_EVALUATION_THRESHOLD,
ALERT_EVALUATION_VALUE,
@@ -157,7 +157,7 @@ export function registerTransactionDurationAnomalyAlertType({
},
]
: []),
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
},
},
aggs: {
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
index e2a39b521466..3d5b4b754e4a 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
import { flatten, merge, sortBy, sum, pickBy } from 'lodash';
-import { CompositeAggregationSource } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { asMutableArray } from '../../../../common/utils/as_mutable_array';
import { ProcessorEvent } from '../../../../common/processor_event';
import { TelemetryTask } from '.';
@@ -59,7 +59,7 @@ export const tasks: TelemetryTask[] = [
// the transaction count for that time range.
executor: async ({ indices, search }) => {
async function getBucketCountFromPaginatedQuery(
- sources: CompositeAggregationSource[],
+ sources: estypes.AggregationsCompositeAggregationSource[],
prevResult?: {
transaction_count: number;
expected_metric_document_count: number;
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
index 9d7434d127ea..1544538de74a 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
@@ -6,11 +6,7 @@
*/
import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
-import {
- CreateIndexRequest,
- DeleteRequest,
- IndexRequest,
-} from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { unwrapEsResponse } from '../../../../../../observability/server';
import { APMRouteHandlerResources } from '../../../../routes/typings';
import {
@@ -24,7 +20,7 @@ import {
} from '../call_async_with_debug';
import { cancelEsRequestOnAbort } from '../cancel_es_request_on_abort';
-export type APMIndexDocumentParams = IndexRequest;
+export type APMIndexDocumentParams = estypes.IndexRequest;
export type APMInternalClient = ReturnType;
@@ -78,14 +74,14 @@ export function createInternalESClient({
params,
});
},
- delete: (params: DeleteRequest): Promise<{ result: string }> => {
+ delete: (params: estypes.DeleteRequest): Promise<{ result: string }> => {
return callEs({
requestType: 'delete',
cb: () => asInternalUser.delete(params),
params,
});
},
- indicesCreate: (params: CreateIndexRequest) => {
+ indicesCreate: (params: estypes.IndicesCreateRequest) => {
return callEs({
requestType: 'indices.create',
cb: () => asInternalUser.indices.create(params),
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
index c58fb170bd2b..0ec2f2c2fcfb 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
@@ -46,7 +46,7 @@ const chartBase: ChartBase = {
export const percentSystemMemoryUsedScript = {
lang: 'expression',
source: `1 - doc['${METRIC_SYSTEM_FREE_MEMORY}'] / doc['${METRIC_SYSTEM_TOTAL_MEMORY}']`,
-};
+} as const;
export const percentCgroupMemoryUsedScript = {
lang: 'painless',
@@ -68,7 +68,7 @@ export const percentCgroupMemoryUsedScript = {
return used / total;
`,
-};
+} as const;
export async function getMemoryChartData({
environment,
diff --git a/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts b/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
index 64de74fb9023..6047b97651e6 100644
--- a/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
@@ -211,7 +211,7 @@ export async function fetchServicePathsFromTraceIds(
},
},
},
- },
+ } as const,
},
};
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
index bcddbff34a8f..129a0ee73b8c 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
@@ -64,7 +64,7 @@ export async function getServiceAnomalies({
by_field_value: [TRANSACTION_REQUEST, TRANSACTION_PAGE_LOAD],
},
},
- ] as estypes.QueryContainer[],
+ ] as estypes.QueryDslQueryContainer[],
},
},
aggs: {
@@ -74,7 +74,9 @@ export async function getServiceAnomalies({
sources: [
{ serviceName: { terms: { field: 'partition_field_value' } } },
{ jobId: { terms: { field: 'job_id' } } },
- ] as Array>,
+ ] as Array<
+ Record
+ >,
},
aggs: {
metrics: {
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
index c1dfed377a76..9850c36c573d 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
@@ -224,7 +224,9 @@ function getMemoryStats({
script,
}: {
additionalFilters: ESFilter[];
- script: typeof percentCgroupMemoryUsedScript;
+ script:
+ | typeof percentCgroupMemoryUsedScript
+ | typeof percentSystemMemoryUsedScript;
}) => {
return withApmSpan('get_avg_memory_for_service_map_node', async () => {
const response = await apmEventClient.search({
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
index 7ec850717dab..f43938891f1f 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
@@ -36,10 +36,11 @@ const mappings: Mappings = {
dynamic_templates: [
{
// force string to keyword (instead of default of text + keyword)
+ // @ts-expect-error @elastic/elasticsearch expects here mapping: MappingPropertyBase
strings: {
match_mapping_type: 'string',
mapping: {
- type: 'keyword',
+ type: 'keyword' as const,
ignore_above: 1024,
},
},
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
index 3965e363499f..085bb2b4be40 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
@@ -6,7 +6,7 @@
*/
import { ElasticsearchClient, Logger } from 'src/core/server';
-import { PropertyBase } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
import {
createOrUpdateIndex,
Mappings,
@@ -47,7 +47,7 @@ const mappings: Mappings = {
},
},
// FIXME: PropertyBase type is missing .fields
- } as PropertyBase,
+ } as estypes.MappingPropertyBase,
url: {
type: 'keyword',
},
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
index f6b41f462c99..0eac2e08d090 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
@@ -6,7 +6,7 @@
*/
import * as t from 'io-ts';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import {
CustomLink,
CustomLinkES,
@@ -32,7 +32,7 @@ export function listCustomLinks({
should: [
{ term: { [key]: value } },
{ bool: { must_not: [{ exists: { field: key } }] } },
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
},
};
});
diff --git a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
index a946fa66a3b9..157f09978eae 100644
--- a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
+++ b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { ProcessorEvent } from '../../../common/processor_event';
import {
TRACE_ID,
@@ -76,7 +76,7 @@ export async function getTraceItems(
filter: [
{ term: { [TRACE_ID]: traceId } },
...rangeQuery(start, end),
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
should: {
exists: { field: PARENT_ID },
},
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts
index 86be82faee57..8156d52d984d 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts
@@ -23,7 +23,10 @@ type BucketKey = string | Record;
function mergeRequestWithAggs<
TRequestBase extends TransactionGroupRequestBase,
- TAggregationMap extends Record
+ TAggregationMap extends Record<
+ string,
+ estypes.AggregationsAggregationContainer
+ >
>(request: TRequestBase, aggs: TAggregationMap) {
return merge({}, request, {
body: {
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
index 966bf4ab3c58..3e995913aebb 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
@@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { withApmSpan } from '../../../../utils/with_apm_span';
import {
SERVICE_NAME,
@@ -86,7 +86,7 @@ export async function getBuckets({
...rangeQuery(start, end),
...environmentQuery(environment),
...kqlQuery(kuery),
- ] as QueryContainer[];
+ ] as QueryDslQueryContainer[];
async function getSamplesForDistributionBuckets() {
const response = await withApmSpan(
@@ -106,7 +106,7 @@ export async function getBuckets({
should: [
{ term: { [TRACE_ID]: traceId } },
{ term: { [TRANSACTION_ID]: transactionId } },
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
},
},
aggs: {
diff --git a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
index 8b068fd6bd2f..b105f3b5c0a3 100644
--- a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { ESSearchResponse } from '../../../../../../../typings/elasticsearch';
import { PromiseReturnType } from '../../../../../observability/typings/common';
import { rangeQuery } from '../../../../server/utils/queries';
@@ -44,7 +44,7 @@ export function anomalySeriesFetcher({
{ term: { partition_field_value: serviceName } },
{ term: { by_field_value: transactionType } },
...rangeQuery(start, end, 'timestamp'),
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
},
},
aggs: {
diff --git a/x-pack/plugins/apm/server/projections/metrics.ts b/x-pack/plugins/apm/server/projections/metrics.ts
index 68056f091c87..9a757893337e 100644
--- a/x-pack/plugins/apm/server/projections/metrics.ts
+++ b/x-pack/plugins/apm/server/projections/metrics.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
import {
SERVICE_NAME,
@@ -52,7 +52,7 @@ export function getMetricsProjection({
...rangeQuery(start, end),
...environmentQuery(environment),
...kqlQuery(kuery),
- ] as QueryContainer[];
+ ] as QueryDslQueryContainer[];
return {
apm: {
diff --git a/x-pack/plugins/apm/server/projections/transactions.ts b/x-pack/plugins/apm/server/projections/transactions.ts
index dd16b0b910ab..3e830403debb 100644
--- a/x-pack/plugins/apm/server/projections/transactions.ts
+++ b/x-pack/plugins/apm/server/projections/transactions.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
import {
SERVICE_NAME,
@@ -62,7 +62,7 @@ export function getTransactionsProjection({
...rangeQuery(start, end),
...environmentQuery(environment),
...kqlQuery(kuery),
- ] as QueryContainer[],
+ ] as QueryDslQueryContainer[],
};
return {
diff --git a/x-pack/plugins/apm/server/projections/typings.ts b/x-pack/plugins/apm/server/projections/typings.ts
index bb90aa0bf5eb..60a3317af186 100644
--- a/x-pack/plugins/apm/server/projections/typings.ts
+++ b/x-pack/plugins/apm/server/projections/typings.ts
@@ -16,7 +16,7 @@ export type Projection = Omit & {
aggs?: {
[key: string]: {
terms: AggregationOptionsByType['terms'] & { field: string };
- aggs?: Record;
+ aggs?: Record;
};
};
};
diff --git a/x-pack/plugins/apm/server/utils/queries.ts b/x-pack/plugins/apm/server/utils/queries.ts
index 7255e7ed75a6..f21ef9de0283 100644
--- a/x-pack/plugins/apm/server/utils/queries.ts
+++ b/x-pack/plugins/apm/server/utils/queries.ts
@@ -13,9 +13,11 @@ import {
} from '../../common/environment_filter_values';
export { kqlQuery, rangeQuery } from '../../../observability/server';
-type QueryContainer = ESFilter;
+type QueryDslQueryContainer = ESFilter;
-export function environmentQuery(environment?: string): QueryContainer[] {
+export function environmentQuery(
+ environment?: string
+): QueryDslQueryContainer[] {
if (!environment || environment === ENVIRONMENT_ALL.value) {
return [];
}
diff --git a/x-pack/plugins/canvas/types/strategy.ts b/x-pack/plugins/canvas/types/strategy.ts
index 1c94059f0c9c..d7115a3e4372 100644
--- a/x-pack/plugins/canvas/types/strategy.ts
+++ b/x-pack/plugins/canvas/types/strategy.ts
@@ -6,7 +6,7 @@
*/
import { ApiResponse } from '@elastic/elasticsearch/lib/Transport';
-import { QuerySqlResponse } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
import { IKibanaSearchRequest } from 'src/plugins/data/common';
import { ExpressionValueFilter } from '.';
export interface EssqlSearchStrategyRequest extends IKibanaSearchRequest {
@@ -27,5 +27,5 @@ export interface EssqlSearchStrategyResponse {
}>;
rows: any[];
- rawResponse: ApiResponse;
+ rawResponse: ApiResponse;
}
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
index 196314a0ecbf..5618f6c83ff0 100644
--- a/x-pack/plugins/cases/server/services/cases/index.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -16,7 +16,7 @@ import {
SavedObjectsFindResult,
} from 'kibana/server';
-import { AggregationContainer } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { nodeBuilder, KueryNode } from '../../../../../../src/plugins/data/common';
import { SecurityPluginSetup } from '../../../../security/server';
@@ -218,7 +218,9 @@ export class CasesService {
private readonly authentication?: SecurityPluginSetup['authc']
) {}
- private buildCaseIdsAggs = (size: number = 100): Record => ({
+ private buildCaseIdsAggs = (
+ size: number = 100
+ ): Record => ({
references: {
nested: {
path: `${CASE_COMMENT_SAVED_OBJECT}.references`,
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index dd6ac6350d6e..e42e24e4b47d 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -240,7 +240,7 @@ export class ClusterClientAdapter {
+): maybeDocument is estypes.MgetHit {
return '_id' in maybeDocument && '_source' in maybeDocument;
}
-export type ESAgentDocumentResult = estypes.MultiGetHit;
+export type ESAgentDocumentResult = estypes.MgetHit;
export async function getAgentDocuments(
esClient: ElasticsearchClient,
agentIds: string[]
diff --git a/x-pack/plugins/fleet/server/services/agents/helpers.ts b/x-pack/plugins/fleet/server/services/agents/helpers.ts
index c4273a57ddff..822a2a9df98d 100644
--- a/x-pack/plugins/fleet/server/services/agents/helpers.ts
+++ b/x-pack/plugins/fleet/server/services/agents/helpers.ts
@@ -11,7 +11,7 @@ import type { SearchHit } from '../../../../../../typings/elasticsearch';
import type { Agent, AgentSOAttributes, FleetServerAgent } from '../../types';
type FleetServerAgentESResponse =
- | estypes.MultiGetHit
+ | estypes.MgetHit
| estypes.SearchResponse['hits']['hits'][0]
| SearchHit;
diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
index 63085b7729c4..a87432c63924 100644
--- a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
@@ -85,7 +85,7 @@ describe('reassignAgents (plural)', () => {
// calls ES update with correct values
const calledWith = esClient.bulk.mock.calls[0][0];
// only 1 are regular and bulk write two line per update
- expect(calledWith.body.length).toBe(2);
+ expect(calledWith.body?.length).toBe(2);
// @ts-expect-error
expect(calledWith.body[0].update._id).toEqual(agentInRegularDoc._id);
});
diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
index 33f12dc52dc0..3621bc5025ab 100644
--- a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
@@ -94,11 +94,11 @@ describe('unenrollAgents (plural)', () => {
// calls ES update with correct values
const calledWith = esClient.bulk.mock.calls[1][0];
const ids = calledWith?.body
- .filter((i: any) => i.update !== undefined)
+ ?.filter((i: any) => i.update !== undefined)
.map((i: any) => i.update._id);
- const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+ const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
expect(ids).toEqual(idsToUnenroll);
- for (const doc of docs) {
+ for (const doc of docs!) {
expect(doc).toHaveProperty('unenrollment_started_at');
}
});
@@ -112,11 +112,11 @@ describe('unenrollAgents (plural)', () => {
const onlyRegular = [agentInRegularDoc._id, agentInRegularDoc2._id];
const calledWith = esClient.bulk.mock.calls[1][0];
const ids = calledWith?.body
- .filter((i: any) => i.update !== undefined)
+ ?.filter((i: any) => i.update !== undefined)
.map((i: any) => i.update._id);
- const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+ const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
expect(ids).toEqual(onlyRegular);
- for (const doc of docs) {
+ for (const doc of docs!) {
expect(doc).toHaveProperty('unenrollment_started_at');
}
});
@@ -150,11 +150,11 @@ describe('unenrollAgents (plural)', () => {
const onlyRegular = [agentInRegularDoc._id, agentInRegularDoc2._id];
const calledWith = esClient.bulk.mock.calls[0][0];
const ids = calledWith?.body
- .filter((i: any) => i.update !== undefined)
+ ?.filter((i: any) => i.update !== undefined)
.map((i: any) => i.update._id);
- const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+ const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
expect(ids).toEqual(onlyRegular);
- for (const doc of docs) {
+ for (const doc of docs!) {
expect(doc).toHaveProperty('unenrolled_at');
}
});
@@ -167,11 +167,11 @@ describe('unenrollAgents (plural)', () => {
// calls ES update with correct values
const calledWith = esClient.bulk.mock.calls[1][0];
const ids = calledWith?.body
- .filter((i: any) => i.update !== undefined)
+ ?.filter((i: any) => i.update !== undefined)
.map((i: any) => i.update._id);
- const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+ const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
expect(ids).toEqual(idsToUnenroll);
- for (const doc of docs) {
+ for (const doc of docs!) {
expect(doc).toHaveProperty('unenrollment_started_at');
}
});
@@ -205,11 +205,11 @@ describe('unenrollAgents (plural)', () => {
// calls ES update with correct values
const calledWith = esClient.bulk.mock.calls[0][0];
const ids = calledWith?.body
- .filter((i: any) => i.update !== undefined)
+ ?.filter((i: any) => i.update !== undefined)
.map((i: any) => i.update._id);
- const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+ const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
expect(ids).toEqual(idsToUnenroll);
- for (const doc of docs) {
+ for (const doc of docs!) {
expect(doc).toHaveProperty('unenrolled_at');
}
});
diff --git a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
index 511a0abecbc1..f9aab997f063 100644
--- a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
@@ -197,7 +197,6 @@ export async function generateEnrollmentAPIKey(
.createApiKey({
body: {
name,
- // @ts-expect-error Metadata in api keys
metadata: {
managed_by: 'fleet',
managed: true,
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
index 8c58238588b2..552e486552a7 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
@@ -142,6 +142,7 @@ describe('EPM install', () => {
it('tests installPackage remove the aliases property if the property existed', async () => {
const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+ // @ts-expect-error not full interface
esClient.indices.getIndexTemplate.mockImplementation(() =>
elasticsearchServiceMock.createSuccessTransportRequestPromise({
index_templates: [
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
index 9e8277eb6171..d202dab54f5b 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
@@ -183,6 +183,7 @@ function putComponentTemplate(
};
return {
+ // @ts-expect-error body expected to be ClusterPutComponentTemplateRequest
clusterPromise: esClient.cluster.putComponentTemplate(esClientParams, { ignore: [404] }),
name,
};
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
index 5dd2755390ec..07d0df021c82 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -527,7 +527,6 @@ const updateExistingDataStream = async ({
await esClient.indices.putMapping({
index: dataStreamName,
body: mappings,
- // @ts-expect-error @elastic/elasticsearch doesn't declare it on PutMappingRequest
write_index_only: true,
});
// if update fails, rollover data stream
@@ -549,7 +548,7 @@ const updateExistingDataStream = async ({
try {
await esClient.indices.putSettings({
index: dataStreamName,
- body: { index: { default_pipeline: settings.index.default_pipeline } },
+ body: { settings: { default_pipeline: settings.index.default_pipeline } },
});
} catch (err) {
throw new Error(`could not update index template settings for ${dataStreamName}`);
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
index 77f14decc564..a18459d5d21b 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
@@ -24,7 +24,6 @@ async function addLifecyclePolicy(
},
};
- // @ts-expect-error @elastic/elasticsearch UpdateIndexSettingsRequest does not support index property
return client.indices.putSettings({ index: indexName, body });
}
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
index 4d467a807109..823b36e63a87 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
@@ -80,6 +80,7 @@ async function updateIndexTemplate(
if (isLegacy) {
return client.indices.putTemplate({ name: templateName, body: indexTemplate });
}
+ // @ts-expect-error Type 'IndexSettings' is not assignable to type 'IndicesIndexSettings'.
return client.indices.putIndexTemplate({ name: templateName, body: indexTemplate });
}
diff --git a/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts b/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
index 77c7947ce22c..ee831d9a98eb 100644
--- a/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
+++ b/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
@@ -22,7 +22,7 @@ export interface ResolvedLogSourceConfiguration {
tiebreakerField: string;
messageField: string[];
fields: IndexPattern['fields'];
- runtimeMappings: estypes.RuntimeFields;
+ runtimeMappings: estypes.MappingRuntimeFields;
columns: LogSourceColumnConfiguration[];
}
@@ -103,12 +103,12 @@ const resolveKibanaIndexPatternReference = async (
};
// this might take other sources of runtime fields into account in the future
-const resolveRuntimeMappings = (indexPattern: IndexPattern): estypes.RuntimeFields => {
+const resolveRuntimeMappings = (indexPattern: IndexPattern): estypes.MappingRuntimeFields => {
const { runtimeFields } = indexPattern.getComputedFields();
const runtimeMappingsFromIndexPattern = (Object.entries(runtimeFields) as ObjectEntries<
typeof runtimeFields
- >).reduce(
+ >).reduce(
(accumulatedMappings, [runtimeFieldName, runtimeFieldSpec]) => ({
...accumulatedMappings,
[runtimeFieldName]: {
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
index caf8e32814fe..f3e227c6b71d 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
@@ -54,6 +54,7 @@ describe('ExpressionChart', () => {
metricAlias: 'metricbeat-*',
inventoryDefaultView: 'host',
metricsExplorerDefaultView: 'host',
+
fields: {
timestamp: '@timestamp',
container: 'container.id',
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
index 9eadc3035588..9de6e574ecb5 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
@@ -19,7 +19,7 @@ interface RequestArgs {
timestampField: string;
startTime: number;
endTime: number;
- runtimeMappings: estypes.RuntimeFields;
+ runtimeMappings: estypes.MappingRuntimeFields;
}
export const callValidateDatasetsAPI = async (requestArgs: RequestArgs, fetch: HttpHandler) => {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
index f9eb7609e00f..a211fecc807f 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
@@ -20,7 +20,7 @@ import { decodeOrThrow } from '../../../../../common/runtime_types';
interface RequestArgs {
indices: string[];
fields: ValidationIndicesFieldSpecification[];
- runtimeMappings: estypes.RuntimeFields;
+ runtimeMappings: estypes.MappingRuntimeFields;
}
export const callValidateIndicesAPI = async (requestArgs: RequestArgs, fetch: HttpHandler) => {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
index 36371b080ee4..4ae99b95cfff 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
@@ -47,7 +47,7 @@ export interface ModuleDescriptor {
validateSetupIndices: (
indices: string[],
timestampField: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
fetch: HttpHandler
) => Promise;
validateSetupDatasets: (
@@ -55,7 +55,7 @@ export interface ModuleDescriptor {
timestampField: string,
startTime: number,
endTime: number,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
fetch: HttpHandler
) => Promise;
}
@@ -65,5 +65,5 @@ export interface ModuleSourceConfiguration {
sourceId: string;
spaceId: string;
timestampField: string;
- runtimeMappings: estypes.RuntimeFields;
+ runtimeMappings: estypes.MappingRuntimeFields;
}
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
index 981b7b496b43..af2bd1802042 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
@@ -136,7 +136,7 @@ const cleanUpModule = async (spaceId: string, sourceId: string, fetch: HttpHandl
const validateSetupIndices = async (
indices: string[],
timestampField: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
fetch: HttpHandler
) => {
return await callValidateIndicesAPI(
@@ -167,7 +167,7 @@ const validateSetupDatasets = async (
timestampField: string,
startTime: number,
endTime: number,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
fetch: HttpHandler
) => {
return await callValidateDatasetsAPI(
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx
index a2ad5cd4f56c..86e8e75dc3d4 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx
@@ -26,7 +26,7 @@ export const useLogEntryCategoriesModule = ({
sourceId: string;
spaceId: string;
timestampField: string;
- runtimeMappings: estypes.RuntimeFields;
+ runtimeMappings: estypes.MappingRuntimeFields;
}) => {
const sourceConfiguration: ModuleSourceConfiguration = useMemo(
() => ({
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
index 345f221f11c1..9704afd80e9e 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
@@ -128,7 +128,7 @@ const cleanUpModule = async (spaceId: string, sourceId: string, fetch: HttpHandl
const validateSetupIndices = async (
indices: string[],
timestampField: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
fetch: HttpHandler
) => {
return await callValidateIndicesAPI(
@@ -155,7 +155,7 @@ const validateSetupDatasets = async (
timestampField: string,
startTime: number,
endTime: number,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
fetch: HttpHandler
) => {
return await callValidateDatasetsAPI(
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx
index b451cad1c875..0df5d9b446db 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx
@@ -25,7 +25,7 @@ export const useLogEntryRateModule = ({
sourceId: string;
spaceId: string;
timestampField: string;
- runtimeMappings: estypes.RuntimeFields;
+ runtimeMappings: estypes.MappingRuntimeFields;
}) => {
const sourceConfiguration: ModuleSourceConfiguration = useMemo(
() => ({
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index dab36a9cb131..cce1ab51c484 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -161,7 +161,7 @@ export class KibanaFramework {
apiResult = elasticsearch.client.asCurrentUser.msearch({
...params,
...frozenIndicesParams,
- } as estypes.MultiSearchRequest);
+ } as estypes.MsearchRequest);
break;
case 'fieldCaps':
apiResult = elasticsearch.client.asCurrentUser.fieldCaps({
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
index 1c1edb3ea832..ffabd7ba65f0 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
@@ -24,7 +24,7 @@ import {
GroupedSearchQueryResponse,
} from '../../../../common/alerting/logs/log_threshold/types';
import { alertsMock } from '../../../../../alerting/server/mocks';
-import { estypes } from '@elastic/elasticsearch';
+import type { estypes } from '@elastic/elasticsearch';
// Mocks //
const numericField = {
@@ -70,7 +70,7 @@ const baseAlertParams: Pick = {
const TIMESTAMP_FIELD = '@timestamp';
const FILEBEAT_INDEX = 'filebeat-*';
-const runtimeMappings: estypes.RuntimeFields = {
+const runtimeMappings: estypes.MappingRuntimeFields = {
runtime_field: {
type: 'keyword',
script: {
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
index 3e910e5dfbf4..a53780120221 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
@@ -113,7 +113,7 @@ async function executeAlert(
alertParams: CountAlertParams,
timestampField: string,
indexPattern: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
esClient: ElasticsearchClient,
alertInstanceFactory: LogThresholdAlertServices['alertInstanceFactory']
) {
@@ -144,7 +144,7 @@ async function executeRatioAlert(
alertParams: RatioAlertParams,
timestampField: string,
indexPattern: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
esClient: ElasticsearchClient,
alertInstanceFactory: LogThresholdAlertServices['alertInstanceFactory']
) {
@@ -198,7 +198,7 @@ const getESQuery = (
alertParams: Omit & { criteria: CountCriteria },
timestampField: string,
indexPattern: string,
- runtimeMappings: estypes.RuntimeFields
+ runtimeMappings: estypes.MappingRuntimeFields
) => {
return hasGroupBy(alertParams)
? getGroupedESQuery(alertParams, timestampField, indexPattern, runtimeMappings)
@@ -433,7 +433,7 @@ export const getGroupedESQuery = (
params: Pick & { criteria: CountCriteria },
timestampField: string,
index: string,
- runtimeMappings: estypes.RuntimeFields
+ runtimeMappings: estypes.MappingRuntimeFields
): estypes.SearchRequest | undefined => {
const { groupBy } = params;
@@ -493,7 +493,7 @@ export const getUngroupedESQuery = (
params: Pick & { criteria: CountCriteria },
timestampField: string,
index: string,
- runtimeMappings: estypes.RuntimeFields
+ runtimeMappings: estypes.MappingRuntimeFields
): object => {
const { rangeFilter, mustFilters, mustNotFilters } = buildFiltersFromCriteria(
params,
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
index 387143ef9f9c..ad8650bbb0fb 100644
--- 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
@@ -277,7 +277,7 @@ export class InfraLogEntriesDomain {
indexName: string,
startTime: number,
endTime: number,
- runtimeMappings: estypes.RuntimeFields
+ runtimeMappings: estypes.MappingRuntimeFields
) {
let datasetBuckets: LogEntryDatasetBucket[] = [];
let afterLatestBatchKey: CompositeDatasetKey | undefined;
diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts
index 18e04aaf063d..3431f3bfb0c8 100644
--- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts
+++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts
@@ -15,7 +15,7 @@ export const createLogEntryDatasetsQuery = (
timestampField: string,
startTime: number,
endTime: number,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
size: number,
afterKey?: CompositeDatasetKey
) => ({
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
index 716ab400c012..3210f01116f7 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
@@ -387,7 +387,7 @@ export async function fetchLogEntryExamples(
context: InfraPluginRequestHandlerContext & { infra: Required },
sourceId: string,
indices: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
timestampField: string,
tiebreakerField: string,
startTime: number,
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
index ee2441d59113..7739f39cb562 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
@@ -404,7 +404,7 @@ async function fetchTopLogEntryCategoryHistograms(
async function fetchLogEntryCategoryExamples(
requestContext: { core: { elasticsearch: { client: { asCurrentUser: ElasticsearchClient } } } },
indices: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
timestampField: string,
tiebreakerField: string,
startTime: number,
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts
index f06dcd43a915..0fef7dedfff0 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts
@@ -12,7 +12,7 @@ import { defaultRequestParameters } from './common';
export const createLogEntryCategoryExamplesQuery = (
indices: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
timestampField: string,
tiebreakerField: string,
startTime: number,
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts
index 1e8cbe247dd5..ee339c9c6eb7 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts
@@ -13,7 +13,7 @@ import { defaultRequestParameters } from './common';
export const createLogEntryExamplesQuery = (
indices: string,
- runtimeMappings: estypes.RuntimeFields,
+ runtimeMappings: estypes.MappingRuntimeFields,
timestampField: string,
tiebreakerField: string,
startTime: number,
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts b/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts
index 950ecc98619e..ef789c1b4134 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts
@@ -43,7 +43,7 @@ export const initValidateLogAnalysisDatasetsRoute = ({
indexName,
startTime,
endTime,
- runtimeMappings as estypes.RuntimeFields
+ runtimeMappings as estypes.MappingRuntimeFields
);
return {
diff --git a/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts b/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts
index 6df17dbfd7bf..9022195dce85 100644
--- a/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts
@@ -29,7 +29,7 @@ export const createGetLogEntriesQuery = (
timestampField: string,
tiebreakerField: string,
fields: string[],
- runtimeMappings?: estypes.RuntimeFields,
+ runtimeMappings?: estypes.MappingRuntimeFields,
query?: JsonObject,
highlightTerm?: string
): estypes.AsyncSearchSubmitRequest => {
@@ -52,8 +52,8 @@ export const createGetLogEntriesQuery = (
],
},
},
- // @ts-expect-error @elastic/elasticsearch doesn't declare body.fields on AsyncSearchSubmitRequest
fields,
+ // @ts-expect-error @elastic/elasticsearch doesn't declare "runtime_mappings" property
runtime_mappings: runtimeMappings,
_source: false,
...createSortClause(sortDirection, timestampField, tiebreakerField),
diff --git a/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts b/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts
index 6bef317d96ad..8da2f1d685db 100644
--- a/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts
@@ -18,7 +18,7 @@ export const createGetLogEntryQuery = (
logEntryId: string,
timestampField: string,
tiebreakerField: string,
- runtimeMappings?: estypes.RuntimeFields
+ runtimeMappings?: estypes.MappingRuntimeFields
): estypes.AsyncSearchSubmitRequest => ({
index: logEntryIndex,
terminate_after: 1,
@@ -31,8 +31,8 @@ export const createGetLogEntryQuery = (
values: [logEntryId],
},
},
- // @ts-expect-error @elastic/elasticsearch doesn't declare body.fields on AsyncSearchSubmitRequest
fields: ['*'],
+ // @ts-expect-error @elastic/elasticsearch doesn't declare "runtime_mappings" property
runtime_mappings: runtimeMappings,
sort: [{ [timestampField]: 'desc' }, { [tiebreakerField]: 'desc' }],
_source: false,
diff --git a/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts b/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts
index 5360e2713aee..d2669e7c0012 100644
--- a/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts
+++ b/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts
@@ -5,10 +5,12 @@
* 2.0.
*/
-import { Pipeline as ESPipeline } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
import { Pipeline, Processor } from '../types';
-export function deserializePipelines(pipelinesByName: { [key: string]: ESPipeline }): Pipeline[] {
+export function deserializePipelines(pipelinesByName: {
+ [key: string]: estypes.IngestPipeline;
+}): Pipeline[] {
const pipelineNames: string[] = Object.keys(pipelinesByName);
const deserializedPipelines = pipelineNames.map((name: string) => {
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
index f697a38e2156..c133b9237102 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
@@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { SimulatePipelineDocument } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { schema } from '@kbn/config-schema';
import { API_BASE_PATH } from '../../../common/constants';
@@ -38,7 +38,7 @@ export const registerSimulateRoute = ({
verbose,
body: {
pipeline,
- docs: documents as SimulatePipelineDocument[],
+ docs: documents as estypes.IngestSimulatePipelineDocument[],
},
});
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
index e71b26b9d4cd..4545e42b2ff9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
@@ -71,7 +71,7 @@ export const createMockedIndexPatternWithoutType = (
searchable: true,
aggregatable: true,
scripted: true,
- lang: 'painless',
+ lang: 'painless' as const,
script: '1234',
},
].filter(({ type }) => type !== typeToFilter);
@@ -145,7 +145,7 @@ export const createMockedIndexPattern = (): IndexPattern => {
searchable: true,
aggregatable: true,
scripted: true,
- lang: 'painless',
+ lang: 'painless' as const,
script: '1234',
},
];
@@ -183,7 +183,7 @@ export const createMockedRestrictedIndexPattern = () => {
searchable: true,
scripted: true,
esTypes: ['keyword'],
- lang: 'painless',
+ lang: 'painless' as const,
script: '1234',
},
];
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.test.ts b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
index 57d8ebf678d6..703b946149e2 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.test.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
@@ -79,7 +79,7 @@ describe('existingFields', () => {
const result = existingFields(
[
{
- // @ts-expect-error _mymeta is not defined on estypes.Hit
+ // @ts-expect-error _mymeta is not defined on estypes.SearchHit
_mymeta: 'abc',
...searchResults({ bar: ['scriptvalue'] }),
},
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.ts b/x-pack/plugins/lens/server/routes/existing_fields.ts
index d775113d83ff..f35b0a7f2317 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.ts
@@ -28,7 +28,7 @@ export interface Field {
name: string;
isScript: boolean;
isMeta: boolean;
- lang?: string;
+ lang?: estypes.ScriptLanguage;
script?: string;
runtimeField?: RuntimeField;
}
@@ -201,10 +201,9 @@ async function fetchIndexPatternStats({
_source: false,
runtime_mappings: runtimeFields.reduce((acc, field) => {
if (!field.runtimeField) return acc;
- // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
acc[field.name] = field.runtimeField;
return acc;
- }, {} as Record),
+ }, {} as Record),
script_fields: scriptedFields.reduce((acc, field) => {
acc[field.name] = {
script: {
@@ -233,7 +232,7 @@ async function fetchIndexPatternStats({
/**
* Exported only for unit tests.
*/
-export function existingFields(docs: estypes.Hit[], fields: Field[]): string[] {
+export function existingFields(docs: estypes.SearchHit[], fields: Field[]): string[] {
const missingFields = new Set(fields);
for (const doc of docs) {
diff --git a/x-pack/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts
index 6b7e197a4d56..ef1043ddd358 100644
--- a/x-pack/plugins/lens/server/routes/field_stats.ts
+++ b/x-pack/plugins/lens/server/routes/field_stats.ts
@@ -79,14 +79,13 @@ export async function initFieldsRoute(setup: CoreSetup) {
},
};
- const search = async (aggs: Record) => {
+ const search = async (aggs: Record) => {
const { body: result } = await requestClient.search({
index: indexPattern.title,
track_total_hits: true,
body: {
query,
aggs,
- // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
runtime_mappings: field.runtimeField ? { [fieldName]: field.runtimeField } : {},
},
size: 0,
@@ -136,7 +135,9 @@ export async function initFieldsRoute(setup: CoreSetup) {
}
export async function getNumberHistogram(
- aggSearchWithBody: (aggs: Record) => Promise,
+ aggSearchWithBody: (
+ aggs: Record
+ ) => Promise,
field: IFieldType,
useTopHits = true
): Promise {
@@ -245,7 +246,7 @@ export async function getNumberHistogram(
}
export async function getStringSamples(
- aggSearchWithBody: (aggs: Record) => unknown,
+ aggSearchWithBody: (aggs: Record) => unknown,
field: IFieldType,
size = 10
): Promise {
@@ -285,7 +286,7 @@ export async function getStringSamples(
// This one is not sampled so that it returns the full date range
export async function getDateHistogram(
- aggSearchWithBody: (aggs: Record) => unknown,
+ aggSearchWithBody: (aggs: Record) => unknown,
field: IFieldType,
range: { fromDate: string; toDate: string }
): Promise {
@@ -332,7 +333,7 @@ function getFieldRef(field: IFieldType) {
return field.scripted
? {
script: {
- lang: field.lang as string,
+ lang: field.lang!,
source: field.script as string,
},
}
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.ts b/x-pack/plugins/lists/server/services/items/find_list_item.ts
index 803cc34ed2a1..29bfdf8bf1d1 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.ts
@@ -76,7 +76,7 @@ export const findListItem = async ({
const { body: respose } = await esClient.count({
body: {
- // @ts-expect-error GetQueryFilterReturn is not assignable to QueryContainer
+ // @ts-expect-error GetQueryFilterReturn is not assignable to QueryDslQueryContainer
query,
},
ignore_unavailable: true,
@@ -89,7 +89,7 @@ export const findListItem = async ({
// to explicitly define the type .
const { body: response } = await esClient.search({
body: {
- // @ts-expect-error GetQueryFilterReturn is not assignable to QueryContainer
+ // @ts-expect-error GetQueryFilterReturn is not assignable to QueryDslQueryContainer
query,
search_after: scroll.searchAfter,
sort: getSortWithTieBreaker({ sortField, sortOrder }),
diff --git a/x-pack/plugins/lists/server/services/lists/find_list.ts b/x-pack/plugins/lists/server/services/lists/find_list.ts
index 1c7a5fe60b99..ae28428d80a5 100644
--- a/x-pack/plugins/lists/server/services/lists/find_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/find_list.ts
@@ -65,7 +65,7 @@ export const findList = async ({
const { body: totalCount } = await esClient.count({
body: {
- // @ts-expect-error GetQueryFilterReturn is not compatible with QueryContainer
+ // @ts-expect-error GetQueryFilterReturn is not compatible with QueryDslQueryContainer
query,
},
ignore_unavailable: true,
@@ -78,7 +78,7 @@ export const findList = async ({
// to explicitly define the type .
const { body: response } = await esClient.search({
body: {
- // @ts-expect-error GetQueryFilterReturn is not compatible with QueryContainer
+ // @ts-expect-error GetQueryFilterReturn is not compatible with QueryDslQueryContainer
query,
search_after: scroll.searchAfter,
sort: getSortWithTieBreaker({ sortField, sortOrder }),
diff --git a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
index 4ddd3f1c7331..e34b3080dd33 100644
--- a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
@@ -46,7 +46,7 @@ export const getSearchAfterScroll = async ({
const { body: response } = await esClient.search>({
body: {
_source: getSourceWithTieBreaker({ sortField }),
- // @ts-expect-error Filter is not assignale to QueryContainer
+ // @ts-expect-error Filter is not assignale to QueryDslQueryContainer
query,
search_after: newSearchAfter,
sort: getSortWithTieBreaker({ sortField, sortOrder }),
diff --git a/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts b/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts
index dbcec20d3d8a..8a513483f5b5 100644
--- a/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts
@@ -13,7 +13,7 @@ export const getSortWithTieBreaker = ({
}: {
sortField: SortFieldOrUndefined;
sortOrder: SortOrderOrUndefined;
-}): estypes.SortCombinations[] => {
+}): estypes.SearchSortCombinations[] => {
const ascOrDesc = sortOrder ?? ('asc' as const);
if (sortField != null) {
return [{ [sortField]: ascOrDesc, tie_breaker_id: 'asc' as const }];
diff --git a/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts b/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
index 585eeeb11811..79db56f9a7fe 100644
--- a/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
+++ b/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
@@ -20,7 +20,7 @@ export interface TransformElasticToListItemOptions {
}
export interface TransformElasticHitToListItemOptions {
- hits: Array>;
+ hits: Array>;
type: Type;
}
diff --git a/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts b/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts
index 1e1afc33394f..10c1d1ba24ae 100755
--- a/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts
+++ b/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts
@@ -13,7 +13,7 @@ describe('cluster', () => {
describe('fromUpstreamJSON factory method', () => {
const upstreamJSON = {
cluster_uuid: 'S-S4NNZDRV-g9c-JrIhx6A',
- } as estypes.RootNodeInfoResponse;
+ } as estypes.InfoResponse;
it('returns correct Cluster instance', () => {
const cluster = Cluster.fromUpstreamJSON(upstreamJSON);
diff --git a/x-pack/plugins/logstash/server/models/cluster/cluster.ts b/x-pack/plugins/logstash/server/models/cluster/cluster.ts
index 88789a2d29c8..2982284879c4 100755
--- a/x-pack/plugins/logstash/server/models/cluster/cluster.ts
+++ b/x-pack/plugins/logstash/server/models/cluster/cluster.ts
@@ -24,7 +24,7 @@ export class Cluster {
}
// generate Pipeline object from elasticsearch response
- static fromUpstreamJSON(upstreamCluster: estypes.RootNodeInfoResponse) {
+ static fromUpstreamJSON(upstreamCluster: estypes.InfoResponse) {
const uuid = upstreamCluster.cluster_uuid;
return new Cluster({ uuid });
}
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.ts b/x-pack/plugins/maps/server/mvt/get_tile.ts
index 95b8e043e0ce..776d316440a5 100644
--- a/x-pack/plugins/maps/server/mvt/get_tile.ts
+++ b/x-pack/plugins/maps/server/mvt/get_tile.ts
@@ -218,7 +218,7 @@ export async function getTile({
// Todo: pass in epochMillies-fields
const featureCollection = hitsToGeoJson(
- // @ts-expect-error hitsToGeoJson should be refactored to accept estypes.Hit
+ // @ts-expect-error hitsToGeoJson should be refactored to accept estypes.SearchHit
documentsResponse.rawResponse.hits.hits,
(hit: Record) => {
return flattenHit(geometryFieldName, hit);
diff --git a/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts b/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts
index d5b5648757e8..f5a46ec04611 100644
--- a/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts
+++ b/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts
@@ -37,9 +37,9 @@ export const postTransforms = (router: IRouter): void => {
auto_start: autoStart = false,
settings: {
max_page_search_size: maxPageSearchSize = 500,
- docs_per_second: docsPerSecond = null,
+ docs_per_second: docsPerSecond = undefined,
} = {
- docsPerSecond: null,
+ docsPerSecond: undefined,
maxPageSearchSize: 500,
},
frequency = '1m',
diff --git a/x-pack/plugins/metrics_entities/server/services/install_transforms.ts b/x-pack/plugins/metrics_entities/server/services/install_transforms.ts
index d0a81955ca18..eec4f8d55535 100644
--- a/x-pack/plugins/metrics_entities/server/services/install_transforms.ts
+++ b/x-pack/plugins/metrics_entities/server/services/install_transforms.ts
@@ -27,7 +27,7 @@ interface CreateTransformOptions {
frequency: string;
logger: Logger;
query: object;
- docsPerSecond: number | null;
+ docsPerSecond: number | undefined;
maxPageSearchSize: number;
sync: {
time: {
diff --git a/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts b/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts
index 1ae9f0d7a2f5..def26c5342ef 100644
--- a/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts
+++ b/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts
@@ -21,7 +21,7 @@ export interface PostTransformsOptions {
autoStart: boolean;
frequency: string;
indices: string[];
- docsPerSecond: number | null;
+ docsPerSecond: number | undefined;
maxPageSearchSize: number;
prefix: string;
query: object;
diff --git a/x-pack/plugins/metrics_entities/server/services/post_transforms.ts b/x-pack/plugins/metrics_entities/server/services/post_transforms.ts
index 1850047ae1e9..f14f53d78f10 100644
--- a/x-pack/plugins/metrics_entities/server/services/post_transforms.ts
+++ b/x-pack/plugins/metrics_entities/server/services/post_transforms.ts
@@ -20,7 +20,7 @@ interface PostTransformsOptions {
autoStart: boolean;
frequency: string;
indices: string[];
- docsPerSecond: number | null;
+ docsPerSecond: number | undefined;
kibanaVersion: string;
maxPageSearchSize: number;
query: object;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts
index 440f4c6e55fb..e1a3f6044587 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts
@@ -9,15 +9,10 @@ import { estypes } from '@elastic/elasticsearch';
export type DatafeedId = string;
-export type Datafeed = estypes.Datafeed;
+export type Datafeed = estypes.MlDatafeed;
-export type ChunkingConfig = estypes.ChunkingConfig;
+export type ChunkingConfig = estypes.MlChunkingConfig;
-export type Aggregation = Record;
+export type Aggregation = Record;
-// export type IndicesOptions = estypes.IndicesOptions;
-export interface IndicesOptions {
- allow_no_indices?: boolean;
- expand_wildcards?: estypes.ExpandWildcards;
- ignore_unavailable?: boolean;
-}
+export type IndicesOptions = estypes.MlDatafeedIndicesOptions;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts
index dd0d3a5001f8..4e23d97c0d14 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts
@@ -7,4 +7,4 @@
import { estypes } from '@elastic/elasticsearch';
-export type DatafeedStats = estypes.DatafeedStats;
+export type DatafeedStats = estypes.MlDatafeedStats;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
index 68544e7cb828..2ef1d824180a 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
@@ -10,23 +10,23 @@ import { estypes } from '@elastic/elasticsearch';
export type JobId = string;
export type BucketSpan = string;
-export type Job = estypes.Job;
+export type Job = estypes.MlJob;
-export type AnalysisConfig = estypes.AnalysisConfig;
+export type AnalysisConfig = estypes.MlAnalysisConfig;
-export type Detector = estypes.Detector;
+export type Detector = estypes.MlDetector;
-export type AnalysisLimits = estypes.AnalysisLimits;
+export type AnalysisLimits = estypes.MlAnalysisLimits;
-export type DataDescription = estypes.DataDescription;
+export type DataDescription = estypes.MlDataDescription;
-export type ModelPlotConfig = estypes.ModelPlotConfig;
+export type ModelPlotConfig = estypes.MlModelPlotConfig;
-export type CustomRule = estypes.DetectionRule;
+export type CustomRule = estypes.MlDetectionRule;
export interface PerPartitionCategorization {
enabled?: boolean;
stop_on_warn?: boolean;
}
-export type CustomSettings = estypes.CustomSettings;
+export type CustomSettings = estypes.MlCustomSettings;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts
index a53f1f248669..5fc8b423a5ac 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts
@@ -7,23 +7,14 @@
import { estypes } from '@elastic/elasticsearch';
-export type JobStats = estypes.JobStats & {
- model_size_stats: ModelSizeStats;
- timing_stats: TimingStats;
-};
+export type JobStats = estypes.MlJobStats;
-export type DataCounts = estypes.DataCounts;
+export type DataCounts = estypes.MlDataCounts;
-export type ModelSizeStats = estypes.ModelSizeStats & {
- model_bytes_exceeded: number;
- model_bytes_memory_limit: number;
- peak_model_bytes?: number;
-};
+export type ModelSizeStats = estypes.MlModelSizeStats;
-export type TimingStats = estypes.TimingStats & {
- total_bucket_processing_time_ms: number;
-};
+export type TimingStats = estypes.MlTimingStats;
-export type ForecastsStats = estypes.JobForecastStatistics;
+export type ForecastsStats = estypes.MlJobForecastStatistics;
-export type Node = estypes.DiscoveryNode;
+export type Node = estypes.MlDiscoveryNode;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts
index f844c42f4ca6..0bb2162994c3 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts
@@ -5,18 +5,6 @@
* 2.0.
*/
-import { JobId } from './job';
-import { ModelSizeStats } from './job_stats';
+import { estypes } from '@elastic/elasticsearch';
-export interface ModelSnapshot {
- job_id: JobId;
- min_version: string;
- timestamp: number;
- description: string;
- snapshot_id: string;
- snapshot_doc_count: number;
- model_size_stats: ModelSizeStats;
- latest_record_time_stamp: number;
- latest_result_time_stamp: number;
- retain: boolean;
-}
+export type ModelSnapshot = estypes.MlModelSnapshot;
diff --git a/x-pack/plugins/ml/common/types/data_frame_analytics.ts b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
index ff5069e7d59a..3305eeaaf479 100644
--- a/x-pack/plugins/ml/common/types/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
@@ -76,7 +76,7 @@ export interface DataFrameAnalyticsConfig {
};
source: {
index: IndexName | IndexName[];
- query?: estypes.QueryContainer;
+ query?: estypes.QueryDslQueryContainer;
runtime_mappings?: RuntimeMappings;
};
analysis: AnalysisConfig;
diff --git a/x-pack/plugins/ml/common/types/es_client.ts b/x-pack/plugins/ml/common/types/es_client.ts
index 249b3c150a08..67adda6b24c1 100644
--- a/x-pack/plugins/ml/common/types/es_client.ts
+++ b/x-pack/plugins/ml/common/types/es_client.ts
@@ -13,13 +13,15 @@ import type { JsonObject } from '../../../../../src/plugins/kibana_utils/common'
import { isPopulatedObject } from '../util/object_utils';
-export function isMultiBucketAggregate(arg: unknown): arg is estypes.MultiBucketAggregate {
+export function isMultiBucketAggregate(
+ arg: unknown
+): arg is estypes.AggregationsMultiBucketAggregate {
return isPopulatedObject(arg, ['buckets']);
}
export const ES_CLIENT_TOTAL_HITS_RELATION: Record<
- Uppercase,
- estypes.TotalHitsRelation
+ Uppercase,
+ estypes.SearchTotalHitsRelation
> = {
EQ: 'eq',
GTE: 'gte',
diff --git a/x-pack/plugins/ml/common/types/fields.ts b/x-pack/plugins/ml/common/types/fields.ts
index cf017192353e..33a4a94e539b 100644
--- a/x-pack/plugins/ml/common/types/fields.ts
+++ b/x-pack/plugins/ml/common/types/fields.ts
@@ -28,7 +28,7 @@ export interface Field {
aggregatable?: boolean;
aggIds?: AggId[];
aggs?: Aggregation[];
- runtimeField?: estypes.RuntimeField;
+ runtimeField?: estypes.MappingRuntimeField;
}
export interface Aggregation {
@@ -112,4 +112,4 @@ export interface AggCardinality {
export type RollupFields = Record]>;
-export type RuntimeMappings = estypes.RuntimeFields;
+export type RuntimeMappings = estypes.MappingRuntimeFields;
diff --git a/x-pack/plugins/ml/common/util/job_utils.ts b/x-pack/plugins/ml/common/util/job_utils.ts
index e7608af553f6..2cb803af3857 100644
--- a/x-pack/plugins/ml/common/util/job_utils.ts
+++ b/x-pack/plugins/ml/common/util/job_utils.ts
@@ -78,7 +78,7 @@ export function isMappableJob(job: CombinedJob, detectorIndex: number): boolean
* if composite is defined.
* @param buckets
*/
-export function hasValidComposite(buckets: estypes.AggregationContainer) {
+export function hasValidComposite(buckets: estypes.AggregationsAggregationContainer) {
if (
isPopulatedObject(buckets, ['composite']) &&
isPopulatedObject(buckets.composite, ['sources']) &&
@@ -157,7 +157,7 @@ export function isSourceDataChartableForDetector(job: CombinedJob, detectorIndex
}
// if fieldName is an aggregated field under nested terms using bucket_script
const aggregations =
- getAggregations(aggs[aggBucketsName]) ?? {};
+ getAggregations(aggs[aggBucketsName]) ?? {};
const foundField = findAggField(aggregations, dtr.field_name, false);
if (foundField?.bucket_script !== undefined) {
return false;
diff --git a/x-pack/plugins/ml/common/util/runtime_field_utils.ts b/x-pack/plugins/ml/common/util/runtime_field_utils.ts
index 7be2a3ec8c9e..1fcf8e2e72b1 100644
--- a/x-pack/plugins/ml/common/util/runtime_field_utils.ts
+++ b/x-pack/plugins/ml/common/util/runtime_field_utils.ts
@@ -11,7 +11,7 @@ import type { RuntimeMappings } from '../types/fields';
type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
-export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField {
+export function isRuntimeField(arg: unknown): arg is estypes.MappingRuntimeField {
return (
((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) ||
(isPopulatedObject(arg, ['type', 'script']) &&
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/common.ts b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
index 24a3cfb70d18..a64594e86a75 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/common.ts
+++ b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
@@ -181,7 +181,7 @@ export const getDataGridSchemasFromFieldTypes = (fieldTypes: FieldTypes, results
export const NON_AGGREGATABLE = 'non-aggregatable';
export const getDataGridSchemaFromESFieldType = (
- fieldType: ES_FIELD_TYPES | undefined | estypes.RuntimeField['type']
+ fieldType: ES_FIELD_TYPES | undefined | estypes.MappingRuntimeField['type']
): string | undefined => {
// Built-in values are ['boolean', 'currency', 'datetime', 'numeric', 'json']
// To fall back to the default string schema it needs to be undefined.
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/types.ts b/x-pack/plugins/ml/public/application/components/data_grid/types.ts
index 865e09e72b40..9dcd6abb432b 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/types.ts
+++ b/x-pack/plugins/ml/public/application/components/data_grid/types.ts
@@ -27,7 +27,7 @@ export type DataGridItem = Record;
// `undefined` is used to indicate a non-initialized state.
export type ChartsVisible = boolean | undefined;
-export type RowCountRelation = estypes.TotalHitsRelation | undefined;
+export type RowCountRelation = estypes.SearchTotalHitsRelation | undefined;
export type IndexPagination = Pick;
diff --git a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
index 15979751f40d..a9217d884fd3 100644
--- a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
+++ b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
@@ -31,7 +31,6 @@ export function chartLoaderProvider(mlResultsService: MlResultsService) {
job.data_counts.latest_record_timestamp,
intervalMs,
job.datafeed_config.runtime_mappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
job.datafeed_config.indices_options
);
if (resp.error !== undefined) {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
index 88f403cdf0c4..920f56b37674 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
@@ -67,7 +67,7 @@ export const getIndexData = async (
setRowCount(typeof resp.hits.total === 'number' ? resp.hits.total : resp.hits.total.value);
setRowCountRelation(
typeof resp.hits.total === 'number'
- ? ('eq' as estypes.TotalHitsRelation)
+ ? ('eq' as estypes.SearchTotalHitsRelation)
: resp.hits.total.relation
);
setTableItems(
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
index 79986e8ddb09..72853ec23fd3 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
@@ -18,7 +18,7 @@ export const CATEGORICAL_TYPES = new Set(['ip', 'keyword']);
// Regression supports numeric fields. Classification supports categorical, numeric, and boolean.
export const shouldAddAsDepVarOption = (
fieldId: string,
- fieldType: ES_FIELD_TYPES | estypes.RuntimeField['type'],
+ fieldType: ES_FIELD_TYPES | estypes.MappingRuntimeField['type'],
jobType: AnalyticsJobType
) => {
if (fieldId === EVENT_RATE_FIELD_ID) return false;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
index f3b51acf093a..ddf88ce79ab5 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
@@ -45,7 +45,9 @@ interface MLEuiDataGridColumn extends EuiDataGridColumn {
function getRuntimeFieldColumns(runtimeMappings: RuntimeMappings) {
return Object.keys(runtimeMappings).map((id) => {
const field = runtimeMappings[id];
- const schema = getDataGridSchemaFromESFieldType(field.type as estypes.RuntimeField['type']);
+ const schema = getDataGridSchemaFromESFieldType(
+ field.type as estypes.MappingRuntimeField['type']
+ );
return { id, schema, isExpandable: schema !== 'boolean', isRuntimeFieldColumn: true };
});
}
@@ -194,7 +196,7 @@ export const useIndexData = (
setRowCount(typeof resp.hits.total === 'number' ? resp.hits.total : resp.hits.total.value);
setRowCountRelation(
typeof resp.hits.total === 'number'
- ? ('eq' as estypes.TotalHitsRelation)
+ ? ('eq' as estypes.SearchTotalHitsRelation)
: resp.hits.total.relation
);
setTableItems(docs);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
index 45b26226def8..35847839b02a 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
@@ -29,7 +29,7 @@ export interface RichDetector {
byField: SplitField;
overField: SplitField;
partitionField: SplitField;
- excludeFrequent: estypes.ExcludeFrequent | null;
+ excludeFrequent: estypes.MlExcludeFrequent | null;
description: string | null;
customRules: CustomRule[] | null;
useNull: boolean | null;
@@ -58,7 +58,7 @@ export class AdvancedJobCreator extends JobCreator {
byField: SplitField,
overField: SplitField,
partitionField: SplitField,
- excludeFrequent: estypes.ExcludeFrequent | null,
+ excludeFrequent: estypes.MlExcludeFrequent | null,
description: string | null,
useNull: boolean | null
) {
@@ -87,7 +87,7 @@ export class AdvancedJobCreator extends JobCreator {
byField: SplitField,
overField: SplitField,
partitionField: SplitField,
- excludeFrequent: estypes.ExcludeFrequent | null,
+ excludeFrequent: estypes.MlExcludeFrequent | null,
description: string | null,
index: number,
useNull: boolean | null
@@ -120,7 +120,7 @@ export class AdvancedJobCreator extends JobCreator {
byField: SplitField,
overField: SplitField,
partitionField: SplitField,
- excludeFrequent: estypes.ExcludeFrequent | null,
+ excludeFrequent: estypes.MlExcludeFrequent | null,
description: string | null,
customRules: CustomRule[] | null,
useNull: boolean | null
@@ -193,7 +193,6 @@ export class AdvancedJobCreator extends JobCreator {
timeFieldName: this.timeFieldName,
query: this.query,
runtimeMappings: this.datafeedConfig.runtime_mappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
indicesOptions: this.datafeedConfig.indices_options,
});
this.setTimeRange(start.epoch, end.epoch);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
index fe0329851758..d4a410bcda24 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
@@ -226,6 +226,7 @@ export class JobCreator {
}
public get groups(): string[] {
+ // @ts-expect-error @elastic-elasticsearch FIXME groups is optional
return this._job_config.groups;
}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts
index 7f1ee2349c2c..f81362ad8328 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts
@@ -54,19 +54,19 @@ function getDatafeed(): Datafeed {
runtime_mappings: {
responsetime_big: {
type: 'double',
- // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
script: {
source: "emit(doc['responsetime'].value * 100.0)",
},
},
airline_lower: {
type: 'keyword',
- // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
script: {
source: "emit(doc['airline'].value.toLowerCase())",
},
},
},
+ chunking_config: { mode: 'auto' },
+ delayed_data_check_config: { enabled: false },
};
}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
index b51cd9b99792..641eda3dbf3e 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
@@ -52,7 +52,6 @@ export class CategorizationExamplesLoader {
this._jobCreator.end,
analyzer,
this._jobCreator.runtimeMappings ?? undefined,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
this._jobCreator.datafeedConfig.indices_options
);
return resp;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
index 6d5fa26af702..a01581f7526c 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
@@ -257,7 +257,6 @@ export class ResultsLoader {
const fieldValues = await this._chartLoader.loadFieldExampleValues(
this._jobCreator.splitField,
this._jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
this._jobCreator.datafeedConfig.indices_options
);
if (fieldValues.length > 0) {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
index 2b1a35bcb8c4..237af335ffa5 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
@@ -173,7 +173,7 @@ export const AdvancedDetectorModal: FC = ({
partitionField,
excludeFrequent:
excludeFrequentOption.label !== ''
- ? (excludeFrequentOption.label as estypes.ExcludeFrequent)
+ ? (excludeFrequentOption.label as estypes.MlExcludeFrequent)
: null,
description: descriptionOption !== '' ? descriptionOption : null,
customRules: null,
@@ -349,7 +349,7 @@ function createFieldOption(field: Field | null): EuiComboBoxOptionOption {
}
function createExcludeFrequentOption(
- excludeFrequent: estypes.ExcludeFrequent | null
+ excludeFrequent: estypes.MlExcludeFrequent | null
): EuiComboBoxOptionOption {
if (excludeFrequent === null) {
return emptyOption;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
index 113bde6fbf93..85083146c137 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
@@ -42,7 +42,6 @@ export function useEstimateBucketSpan() {
splitField: undefined,
timeField: mlContext.currentIndexPattern.timeFieldName,
runtimeMappings: jobCreator.runtimeMappings ?? undefined,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
indicesOptions: jobCreator.datafeedConfig.indices_options,
};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
index c553da93a4bc..9d8485424521 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
@@ -56,7 +56,6 @@ export const CategorizationDetectorsSummary: FC = () => {
jobCreator.end,
chartInterval.getInterval().asMilliseconds(),
jobCreator.runtimeMappings ?? undefined,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
setEventRateChartData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
index 6cbf96fcb04e..58252feca4b5 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
@@ -114,7 +114,6 @@ export const MultiMetricDetectors: FC = ({ setIsValid }) => {
.loadFieldExampleValues(
splitField,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
)
.then(setFieldValues)
@@ -146,7 +145,6 @@ export const MultiMetricDetectors: FC = ({ setIsValid }) => {
fieldValues.length > 0 ? fieldValues[0] : null,
cs.intervalMs,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
setLineChartsData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx
index dc76fc017811..a4c344d16482 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx
@@ -44,7 +44,6 @@ export const MultiMetricDetectorsSummary: FC = () => {
const tempFieldValues = await chartLoader.loadFieldExampleValues(
jobCreator.splitField,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
setFieldValues(tempFieldValues);
@@ -79,7 +78,6 @@ export const MultiMetricDetectorsSummary: FC = () => {
fieldValues.length > 0 ? fieldValues[0] : null,
cs.intervalMs,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
setLineChartsData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
index c5efd4b226d5..1be487d5b7ee 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
@@ -161,7 +161,6 @@ export const PopulationDetectors: FC = ({ setIsValid }) => {
jobCreator.splitField,
cs.intervalMs,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
@@ -185,7 +184,6 @@ export const PopulationDetectors: FC = ({ setIsValid }) => {
fields: await chartLoader.loadFieldExampleValues(
field,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
),
};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx
index 31b436944a5b..55a9d37d1115 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx
@@ -79,7 +79,6 @@ export const PopulationDetectorsSummary: FC = () => {
jobCreator.splitField,
cs.intervalMs,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
@@ -103,7 +102,6 @@ export const PopulationDetectorsSummary: FC = () => {
fields: await chartLoader.loadFieldExampleValues(
field,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
),
};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
index b2a97d8e0589..d41234bbedd8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
@@ -94,7 +94,6 @@ export const SingleMetricDetectors: FC = ({ setIsValid }) => {
null,
cs.intervalMs,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
if (resp[DTR_IDX] !== undefined) {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx
index 5e64f4ef1898..ced94b2095f7 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx
@@ -60,7 +60,6 @@ export const SingleMetricDetectorsSummary: FC = () => {
null,
cs.intervalMs,
jobCreator.runtimeMappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
if (resp[DTR_IDX] !== undefined) {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx
index 7e7b919f677a..66c92d5c8085 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx
@@ -49,7 +49,6 @@ export const TimeRangeStep: FC = ({ setCurrentStep, isCurrentStep })
jobCreator.end,
chartInterval.getInterval().asMilliseconds(),
jobCreator.runtimeMappings ?? undefined,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
jobCreator.datafeedConfig.indices_options
);
setEventRateChartData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx
index 6ce808ed36b1..d2780691e551 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx
@@ -51,9 +51,9 @@ export const EditJob: FC = ({ job, jobOverride, existingGroupIds,
);
const handleValidation = () => {
- const jobGroupsValidationResult = formState.jobGroups
- .map((group) => groupValidator(group))
- .filter((result) => result !== null);
+ const jobGroupsValidationResult =
+ formState.jobGroups ??
+ [].map((group) => groupValidator(group)).filter((result) => result !== null);
setValidationResult({
jobGroups: jobGroupsValidationResult,
@@ -92,7 +92,7 @@ export const EditJob: FC = ({ job, jobOverride, existingGroupIds,
{
setFormState({
jobGroups: value,
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx
index 311e291cf251..b97c16e02d90 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx
@@ -87,11 +87,12 @@ export const JobItem: FC = memo(
- {jobGroups.map((group) => (
-
- {group}
-
- ))}
+ {jobGroups ??
+ [].map((group) => (
+
+ {group}
+
+ ))}
{setupResult && setupResult.error && (
diff --git a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
index 6e76a536feb2..0a9c76893dd0 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
@@ -242,6 +242,7 @@ export function getMlClient(
}>(...p);
const jobs = await jobSavedObjectService.filterJobsForSpace(
'data-frame-analytics',
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
body.data_frame_analytics,
'id'
);
@@ -494,12 +495,13 @@ function getDFAJobIdsFromRequest([params]: MlGetDFAParams): string[] {
}
function getADJobIdsFromRequest([params]: MlGetADParams): string[] {
- const ids = params?.job_id?.split(',');
+ const ids = typeof params?.job_id === 'string' ? params?.job_id.split(',') : params?.job_id;
return ids || [];
}
function getDatafeedIdsFromRequest([params]: MlGetDatafeedParams): string[] {
- const ids = params?.datafeed_id?.split(',');
+ const ids =
+ typeof params?.datafeed_id === 'string' ? params?.datafeed_id.split(',') : params?.datafeed_id;
return ids || [];
}
diff --git a/x-pack/plugins/ml/server/lib/query_utils.ts b/x-pack/plugins/ml/server/lib/query_utils.ts
index dd4dc01498db..e80113064334 100644
--- a/x-pack/plugins/ml/server/lib/query_utils.ts
+++ b/x-pack/plugins/ml/server/lib/query_utils.ts
@@ -44,7 +44,7 @@ export function buildBaseFilterCriteria(
export function buildSamplerAggregation(
aggs: any,
samplerShardSize: number
-): Record {
+): Record {
if (samplerShardSize < 1) {
return aggs;
}
diff --git a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
index 458a34346bed..791ba6d79ab5 100644
--- a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
@@ -10,7 +10,7 @@ import { difference } from 'lodash';
import { EventManager } from './event_manager';
import type { MlClient } from '../../lib/ml_client';
-type ScheduledEvent = estypes.ScheduledEvent;
+type ScheduledEvent = estypes.MlCalendarEvent;
interface BasicCalendar {
job_ids: string[];
diff --git a/x-pack/plugins/ml/server/models/calendar/event_manager.ts b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
index c870d6752413..d30297eab5c1 100644
--- a/x-pack/plugins/ml/server/models/calendar/event_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
@@ -9,7 +9,7 @@ import { estypes } from '@elastic/elasticsearch';
import { GLOBAL_CALENDAR } from '../../../common/constants/calendars';
import type { MlClient } from '../../lib/ml_client';
-type ScheduledEvent = estypes.ScheduledEvent;
+type ScheduledEvent = estypes.MlCalendarEvent;
export class EventManager {
private _mlClient: MlClient;
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
index a9c1d95d933a..41b8e6dfe96c 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
@@ -67,6 +67,7 @@ export class AnalyticsManager {
async setInferenceModels() {
try {
const models = await this.getAnalyticsModels();
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
this.inferenceModels = models;
} catch (error) {
// eslint-disable-next-line
@@ -77,6 +78,7 @@ export class AnalyticsManager {
async setJobStats() {
try {
const jobStats = await this.getAnalyticsStats();
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
this.jobStats = jobStats;
} catch (error) {
// eslint-disable-next-line
@@ -133,8 +135,10 @@ export class AnalyticsManager {
if (analyticsId !== undefined) {
const jobStats = this.findJobStats(analyticsId);
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
jobData = { ...jobData, stats: { ...jobStats } };
} else {
+ // @ts-expect-error @elastic-elasticsearch Data frame types incompletes
jobData = jobData.map((job: any) => {
const jobStats = this.findJobStats(job.id);
return { ...job, stats: { ...jobStats } };
@@ -270,6 +274,7 @@ export class AnalyticsManager {
// fetch model data and create model elements
let data = await this.getAnalyticsModelData(modelId);
const modelNodeId = `${data.model_id}-${JOB_MAP_NODE_TYPES.TRAINED_MODEL}`;
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
const sourceJobId = data?.metadata?.analytics_config?.id;
let nextLinkId: string | undefined;
let nextType: JobMapNodeTypes | undefined;
@@ -288,17 +293,22 @@ export class AnalyticsManager {
// fetch source job data and create elements
if (sourceJobId !== undefined) {
try {
+ // @ts-expect-error @elastic-elasticsearch Data frame types incompletes
data = await this.getAnalyticsData(sourceJobId);
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
nextLinkId = data?.source?.index[0];
nextType = JOB_MAP_NODE_TYPES.INDEX;
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
previousNodeId = `${data.id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
resultElements.push({
data: {
id: previousNodeId,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
label: data.id,
type: JOB_MAP_NODE_TYPES.ANALYTICS,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
analysisType: getAnalysisType(data?.analysis),
},
});
@@ -332,16 +342,20 @@ export class AnalyticsManager {
const modelElements = [];
const details: any = {};
const data = await this.getAnalyticsData(jobId);
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
const nextLinkId = data?.source?.index[0];
const nextType: JobMapNodeTypes = JOB_MAP_NODE_TYPES.INDEX;
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
const previousNodeId = `${data.id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
resultElements.push({
data: {
id: previousNodeId,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incompletes
label: data.id,
type: JOB_MAP_NODE_TYPES.ANALYTICS,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
analysisType: getAnalysisType(data?.analysis),
isRoot: true,
},
@@ -530,20 +544,27 @@ export class AnalyticsManager {
const jobs = await this.getAnalyticsData();
const comparator = rootTransform !== undefined ? rootTransform : rootIndexPattern;
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
for (let i = 0; i < jobs.length; i++) {
if (
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
jobs[i]?.source?.index[0] === comparator &&
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
this.isDuplicateElement(jobs[i].id, result.elements) === false
) {
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
const nodeId = `${jobs[i].id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
result.elements.push({
data: {
id: nodeId,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
label: jobs[i].id,
type: JOB_MAP_NODE_TYPES.ANALYTICS,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
analysisType: getAnalysisType(jobs[i]?.analysis),
},
});
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
result.details[nodeId] = jobs[i];
const source = `${comparator}-${JOB_MAP_NODE_TYPES.INDEX}`;
result.elements.push({
@@ -555,6 +576,7 @@ export class AnalyticsManager {
});
// Get inference model for analytics job and create model node
({ modelElement, modelDetails, edgeElement } = this.getAnalyticsModelElements(
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
jobs[i].id
));
if (isAnalyticsMapNodeElement(modelElement)) {
@@ -590,10 +612,14 @@ export class AnalyticsManager {
if (analyticsId !== undefined) {
const jobData = await this.getAnalyticsData(analyticsId);
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
const currentJobNodeId = `${jobData.id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
rootIndex = Array.isArray(jobData?.dest?.index)
- ? jobData?.dest?.index[0]
- : jobData?.dest?.index;
+ ? // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
+ jobData?.dest?.index[0]
+ : // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
+ jobData?.dest?.index;
rootIndexNodeId = `${rootIndex}-${JOB_MAP_NODE_TYPES.INDEX}`;
// Fetch inference model for incoming job id and add node and edge
@@ -632,21 +658,28 @@ export class AnalyticsManager {
rootIndexNodeId = `${rootIndex}-${JOB_MAP_NODE_TYPES.INDEX}`;
}
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
for (let i = 0; i < jobs.length; i++) {
if (
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
jobs[i]?.source?.index[0] === rootIndex &&
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
this.isDuplicateElement(jobs[i].id, result.elements) === false
) {
// Create node for associated job
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
const nodeId = `${jobs[i].id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
result.elements.push({
data: {
id: nodeId,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
label: jobs[i].id,
type: JOB_MAP_NODE_TYPES.ANALYTICS,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
analysisType: getAnalysisType(jobs[i]?.analysis),
},
});
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
result.details[nodeId] = jobs[i];
result.elements.push({
diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
index cfe0bcc53263..e608bfeb622d 100644
--- a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
+++ b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
@@ -185,7 +185,6 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) {
} = await asCurrentUser.search({
index,
body,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
...(datafeedConfig?.indices_options ?? {}),
});
@@ -407,7 +406,6 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) {
} = await asCurrentUser.search({
index,
body,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
...(datafeedConfig?.indices_options ?? {}),
});
diff --git a/x-pack/plugins/ml/server/models/filter/filter_manager.ts b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
index 1429324a6d9c..f48b71dedf3e 100644
--- a/x-pack/plugins/ml/server/models/filter/filter_manager.ts
+++ b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
@@ -79,16 +79,16 @@ export class FilterManager {
if (
results[FILTERS] &&
- (results[FILTERS].body as estypes.GetFiltersResponse).filters.length
+ (results[FILTERS].body as estypes.MlGetFiltersResponse).filters.length
) {
let filtersInUse: FiltersInUse = {};
- if (results[JOBS] && (results[JOBS].body as estypes.GetJobsResponse).jobs) {
+ if (results[JOBS] && (results[JOBS].body as estypes.MlGetJobsResponse).jobs) {
filtersInUse = this.buildFiltersInUse(
- (results[JOBS].body as estypes.GetJobsResponse).jobs
+ (results[JOBS].body as estypes.MlGetJobsResponse).jobs
);
}
- const filter = (results[FILTERS].body as estypes.GetFiltersResponse).filters[0];
+ const filter = (results[FILTERS].body as estypes.MlGetFiltersResponse).filters[0];
return {
...filter,
used_by: filtersInUse[filter.filter_id],
@@ -121,8 +121,10 @@ export class FilterManager {
// Build a map of filter_ids against jobs and detectors using that filter.
let filtersInUse: FiltersInUse = {};
- if (results[JOBS] && (results[JOBS].body as estypes.GetJobsResponse).jobs) {
- filtersInUse = this.buildFiltersInUse((results[JOBS].body as estypes.GetJobsResponse).jobs);
+ if (results[JOBS] && (results[JOBS].body as estypes.MlGetJobsResponse).jobs) {
+ filtersInUse = this.buildFiltersInUse(
+ (results[JOBS].body as estypes.MlGetJobsResponse).jobs
+ );
}
// For each filter, return just
@@ -131,16 +133,18 @@ export class FilterManager {
// item_count
// jobs using the filter
const filterStats: FilterStats[] = [];
- if (results[FILTERS] && (results[FILTERS].body as estypes.GetFiltersResponse).filters) {
- (results[FILTERS].body as estypes.GetFiltersResponse).filters.forEach((filter: Filter) => {
- const stats: FilterStats = {
- filter_id: filter.filter_id,
- description: filter.description,
- item_count: filter.items.length,
- used_by: filtersInUse[filter.filter_id],
- };
- filterStats.push(stats);
- });
+ if (results[FILTERS] && (results[FILTERS].body as estypes.MlGetFiltersResponse).filters) {
+ (results[FILTERS].body as estypes.MlGetFiltersResponse).filters.forEach(
+ (filter: Filter) => {
+ const stats: FilterStats = {
+ filter_id: filter.filter_id,
+ description: filter.description,
+ item_count: filter.items.length,
+ used_by: filtersInUse[filter.filter_id],
+ };
+ filterStats.push(stats);
+ }
+ );
}
return filterStats;
diff --git a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
index 72255e168249..5dfe1b5934fe 100644
--- a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
+++ b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
@@ -28,8 +28,8 @@ export interface MlDatafeedsStatsResponse {
interface Results {
[id: string]: {
- started?: estypes.StartDatafeedResponse['started'];
- stopped?: estypes.StopDatafeedResponse['stopped'];
+ started?: estypes.MlStartDatafeedResponse['started'];
+ stopped?: estypes.MlStopDatafeedResponse['stopped'];
error?: any;
};
}
@@ -246,7 +246,6 @@ export function datafeedsProvider(client: IScopedClusterClient, mlClient: MlClie
job.data_description.time_field,
query,
datafeed.runtime_mappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
datafeed.indices_options
);
@@ -378,7 +377,6 @@ export function datafeedsProvider(client: IScopedClusterClient, mlClient: MlClie
const data = {
index: datafeed.indices,
body,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
...(datafeed.indices_options ?? {}),
};
diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
index a838db443beb..b7f8ce569641 100644
--- a/x-pack/plugins/ml/server/models/job_service/jobs.ts
+++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -195,7 +195,6 @@ export function jobsProvider(
processed_record_count: job.data_counts?.processed_record_count,
earliestStartTimestampMs: getEarliestDatafeedStartTime(
dataCounts?.latest_record_timestamp,
- // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
dataCounts?.latest_bucket_timestamp,
parseTimeIntervalForJob(job.analysis_config?.bucket_span)
),
@@ -211,7 +210,6 @@ export function jobsProvider(
earliestTimestampMs: dataCounts?.earliest_record_timestamp,
latestResultsTimestampMs: getLatestDataOrBucketTimestamp(
dataCounts?.latest_record_timestamp,
- // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
dataCounts?.latest_bucket_timestamp
),
isSingleMetricViewerJob: errorMessage === undefined,
@@ -254,7 +252,6 @@ export function jobsProvider(
if (dataCounts !== undefined) {
timeRange.to = getLatestDataOrBucketTimestamp(
dataCounts.latest_record_timestamp as number,
- // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
dataCounts.latest_bucket_timestamp as number
);
timeRange.from = dataCounts.earliest_record_timestamp;
@@ -398,7 +395,6 @@ export function jobsProvider(
if (jobStatsResults && jobStatsResults.jobs) {
const jobStats = jobStatsResults.jobs.find((js) => js.job_id === tempJob.job_id);
if (jobStats !== undefined) {
- // @ts-expect-error @elastic-elasticsearch JobStats type is incomplete
tempJob = { ...tempJob, ...jobStats };
if (jobStats.node) {
tempJob.node = jobStats.node;
@@ -411,7 +407,6 @@ export function jobsProvider(
const latestBucketTimestamp =
latestBucketTimestampByJob && latestBucketTimestampByJob[tempJob.job_id];
if (latestBucketTimestamp) {
- // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
tempJob.data_counts.latest_bucket_timestamp = latestBucketTimestamp;
}
}
@@ -467,7 +462,6 @@ export function jobsProvider(
const jobIds: string[] = [];
try {
const { body } = await asInternalUser.tasks.list({
- // @ts-expect-error @elastic-elasticsearch expects it to be a string
actions,
detailed,
});
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
index 49c09742985d..fad388f791f0 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
@@ -114,7 +114,7 @@ class FieldsService {
this._savedObjectsClient
);
const rollupConfigs:
- | estypes.RollupCapabilitiesJob[]
+ | estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[]
| null = await rollupService.getRollupJobs();
// if a rollup index has been specified, yet there are no
@@ -137,7 +137,9 @@ class FieldsService {
}
}
-function combineAllRollupFields(rollupConfigs: estypes.RollupCapabilitiesJob[]): RollupFields {
+function combineAllRollupFields(
+ rollupConfigs: estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[]
+): RollupFields {
const rollupFields: RollupFields = {};
rollupConfigs.forEach((conf) => {
Object.keys(conf.fields).forEach((fieldName) => {
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
index d83f7afb4cdf..5f5ae16ed973 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
@@ -27,7 +27,9 @@ export async function rollupServiceProvider(
const rollupIndexPatternObject = await loadRollupIndexPattern(indexPattern, savedObjectsClient);
let jobIndexPatterns: string[] = [indexPattern];
- async function getRollupJobs(): Promise {
+ async function getRollupJobs(): Promise<
+ estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[] | null
+ > {
if (rollupIndexPatternObject !== null) {
const parsedTypeMetaData = JSON.parse(rollupIndexPatternObject.attributes.typeMeta);
const rollUpIndex: string = parsedTypeMetaData.params.rollup_index;
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
index 00a51d1e4e15..80eba7b86405 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
@@ -69,7 +69,6 @@ export async function validateJob(
timeField,
job.datafeed_config.query,
job.datafeed_config.runtime_mappings,
- // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
job.datafeed_config.indices_options
);
diff --git a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
index 5205ea7353ac..c5be5e1c9ef2 100644
--- a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
@@ -284,7 +284,7 @@ export function jobRoutes({ router, routeGuard }: RouteInitialization) {
},
routeGuard.fullLicenseAPIGuard(async ({ mlClient, request, response }) => {
try {
- const options: estypes.CloseJobRequest = {
+ const options: estypes.MlCloseJobRequest = {
job_id: request.params.jobId,
};
const force = request.query.force;
@@ -323,7 +323,7 @@ export function jobRoutes({ router, routeGuard }: RouteInitialization) {
},
routeGuard.fullLicenseAPIGuard(async ({ mlClient, request, response }) => {
try {
- const options: estypes.DeleteJobRequest = {
+ const options: estypes.MlDeleteJobRequest = {
job_id: request.params.jobId,
wait_for_completion: false,
};
@@ -517,13 +517,11 @@ export function jobRoutes({ router, routeGuard }: RouteInitialization) {
try {
const { body } = await mlClient.getOverallBuckets({
job_id: request.params.jobId,
- body: {
- top_n: request.body.topN,
- bucket_span: request.body.bucketSpan,
- start: request.body.start !== undefined ? String(request.body.start) : undefined,
- end: request.body.end !== undefined ? String(request.body.end) : undefined,
- overall_score: request.body.overall_score ?? 0,
- },
+ top_n: request.body.topN,
+ bucket_span: request.body.bucketSpan,
+ start: request.body.start !== undefined ? String(request.body.start) : undefined,
+ end: request.body.end !== undefined ? String(request.body.end) : undefined,
+ overall_score: request.body.overall_score ?? 0,
});
return response.ok({
body,
diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
index f6dc21538ffa..2ed4fd6fcd31 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -265,6 +265,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
const { body } = await mlClient.putDataFrameAnalytics(
{
id: analyticsId,
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
body: request.body,
},
getAuthorizationHeader(request)
@@ -301,6 +302,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
try {
const { body } = await mlClient.evaluateDataFrame(
{
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
body: request.body,
},
getAuthorizationHeader(request)
@@ -338,6 +340,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
try {
const { body } = await mlClient.explainDataFrameAnalytics(
{
+ // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
body: request.body,
},
getAuthorizationHeader(request)
diff --git a/x-pack/plugins/ml/server/routes/datafeeds.ts b/x-pack/plugins/ml/server/routes/datafeeds.ts
index 2013af3ee873..9f908bf61a35 100644
--- a/x-pack/plugins/ml/server/routes/datafeeds.ts
+++ b/x-pack/plugins/ml/server/routes/datafeeds.ts
@@ -247,7 +247,7 @@ export function dataFeedRoutes({ router, routeGuard }: RouteInitialization) {
},
routeGuard.fullLicenseAPIGuard(async ({ mlClient, request, response }) => {
try {
- const options: estypes.DeleteDatafeedRequest = {
+ const options: estypes.MlDeleteDatafeedRequest = {
datafeed_id: request.params.datafeedId,
};
const force = request.query.force;
diff --git a/x-pack/plugins/ml/server/routes/trained_models.ts b/x-pack/plugins/ml/server/routes/trained_models.ts
index c4b2d63b05d1..106010d0f755 100644
--- a/x-pack/plugins/ml/server/routes/trained_models.ts
+++ b/x-pack/plugins/ml/server/routes/trained_models.ts
@@ -39,6 +39,7 @@ export function trainedModelsRoutes({ router, routeGuard }: RouteInitialization)
const { modelId } = request.params;
const { with_pipelines: withPipelines, ...query } = request.query;
const { body } = await mlClient.getTrainedModels({
+ // @ts-expect-error @elastic-elasticsearch not sure why this is an error, size is a number
size: 1000,
...query,
...(modelId ? { model_id: modelId } : {}),
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
index 603c66d2d05f..ca8270590da5 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
@@ -26,7 +26,7 @@ describe('fetchAvailableCcs', () => {
elasticsearchClientMock.createSuccessTransportRequestPromise({
[connectedRemote]: {
connected: true,
- } as estypes.RemoteInfo,
+ } as estypes.ClusterRemoteInfoClusterRemoteInfo,
})
);
@@ -41,7 +41,7 @@ describe('fetchAvailableCcs', () => {
elasticsearchClientMock.createSuccessTransportRequestPromise({
[disconnectedRemote]: {
connected: false,
- } as estypes.RemoteInfo,
+ } as estypes.ClusterRemoteInfoClusterRemoteInfo,
})
);
diff --git a/x-pack/plugins/observability/server/lib/annotations/mappings.ts b/x-pack/plugins/observability/server/lib/annotations/mappings.ts
index da72afdbecb3..3313c411b588 100644
--- a/x-pack/plugins/observability/server/lib/annotations/mappings.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/mappings.ts
@@ -6,7 +6,7 @@
*/
export const mappings = {
- dynamic: 'strict' as const,
+ dynamic: 'strict',
properties: {
annotation: {
properties: {
@@ -45,4 +45,4 @@ export const mappings = {
},
},
},
-};
+} as const;
diff --git a/x-pack/plugins/observability/server/utils/create_or_update_index.ts b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
index 19b14ef8b243..7451314ad248 100644
--- a/x-pack/plugins/observability/server/utils/create_or_update_index.ts
+++ b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
@@ -4,12 +4,12 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { CreateIndexRequest, PutMappingRequest } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
import pRetry from 'p-retry';
import { Logger, ElasticsearchClient } from 'src/core/server';
-export type Mappings = Required['body']['mappings'] &
- Required['body'];
+export type Mappings = Required['body']['mappings'] &
+ Required['body'];
export async function createOrUpdateIndex({
index,
@@ -71,7 +71,7 @@ function createNewIndex({
}: {
index: string;
client: ElasticsearchClient;
- mappings: Required['body']['mappings'];
+ mappings: Required['body']['mappings'];
}) {
return client.indices.create({
index,
@@ -90,7 +90,7 @@ function updateExistingIndex({
}: {
index: string;
client: ElasticsearchClient;
- mappings: PutMappingRequest['body'];
+ mappings: estypes.IndicesPutMappingRequest['body'];
}) {
return client.indices.putMapping({
index,
diff --git a/x-pack/plugins/observability/server/utils/queries.ts b/x-pack/plugins/observability/server/utils/queries.ts
index b7412120365c..2ee3291e7fb6 100644
--- a/x-pack/plugins/observability/server/utils/queries.ts
+++ b/x-pack/plugins/observability/server/utils/queries.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { ALERT_STATUS } from '@kbn/rule-data-utils/target/technical_field_names';
import { esKuery } from '../../../../../src/plugins/data/server';
import { AlertStatus } from '../../common/typings';
@@ -18,7 +18,11 @@ export function alertStatusQuery(status: AlertStatus) {
return [{ term: { [ALERT_STATUS]: status } }];
}
-export function rangeQuery(start?: number, end?: number, field = '@timestamp'): QueryContainer[] {
+export function rangeQuery(
+ start?: number,
+ end?: number,
+ field = '@timestamp'
+): estypes.QueryDslQueryContainer[] {
return [
{
range: {
@@ -32,7 +36,7 @@ export function rangeQuery(start?: number, end?: number, field = '@timestamp'):
];
}
-export function kqlQuery(kql?: string): QueryContainer[] {
+export function kqlQuery(kql?: string): estypes.QueryDslQueryContainer[] {
if (!kql) {
return [];
}
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
index d07af8c878c5..fb3bd92abb4c 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
@@ -37,7 +37,7 @@ export type FactoryQueryTypes = OsqueryQueries;
export interface RequestBasicOptions extends IEsSearchRequest {
filterQuery: ESQuery | string | undefined;
- aggregations?: Record;
+ aggregations?: Record;
docValueFields?: DocValueFields[];
factoryQueryType?: FactoryQueryTypes;
}
diff --git a/x-pack/plugins/osquery/public/agents/helpers.ts b/x-pack/plugins/osquery/public/agents/helpers.ts
index a79933db0ceb..df966a01f1de 100644
--- a/x-pack/plugins/osquery/public/agents/helpers.ts
+++ b/x-pack/plugins/osquery/public/agents/helpers.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { Aggregate, TermsAggregate } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { euiPaletteColorBlindBehindText } from '@elastic/eui';
import {
PaginationInputPaginated,
@@ -40,11 +40,11 @@ export const getNumOverlapped = (
});
return sum;
};
-export const processAggregations = (aggs: Record) => {
+export const processAggregations = (aggs: Record) => {
const platforms: Group[] = [];
const overlap: Overlap = {};
- const platformTerms = aggs.platforms as TermsAggregate;
- const policyTerms = aggs.policies as TermsAggregate;
+ const platformTerms = aggs.platforms as estypes.AggregationsTermsAggregate;
+ const policyTerms = aggs.policies as estypes.AggregationsTermsAggregate;
const policies =
policyTerms?.buckets.map((o) => ({ name: o.key, id: o.key, size: o.doc_count })) ?? [];
diff --git a/x-pack/plugins/osquery/public/agents/types.ts b/x-pack/plugins/osquery/public/agents/types.ts
index 302b2686d511..bfe59c91d007 100644
--- a/x-pack/plugins/osquery/public/agents/types.ts
+++ b/x-pack/plugins/osquery/public/agents/types.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { TermsAggregate } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { EuiComboBoxOptionOption } from '@elastic/eui';
import { Agent } from '../../common/shared_imports';
@@ -15,7 +15,7 @@ interface BaseDataPoint {
}
export type AggregationDataPoint = BaseDataPoint & {
- [key: string]: TermsAggregate;
+ [key: string]: estypes.AggregationsTermsAggregate;
};
export interface Group {
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
index e8a8fbd63a84..d74067bff025 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
@@ -52,7 +52,7 @@ export const buildActionResultsQuery = ({
lang: 'painless',
source:
"if (doc['error.keyword'].size()==0) { return 'success' } else { return 'error' }",
- },
+ } as const,
},
},
},
diff --git a/x-pack/plugins/reporting/server/lib/store/mapping.ts b/x-pack/plugins/reporting/server/lib/store/mapping.ts
index e663c7e23b14..1a4567b4aee9 100644
--- a/x-pack/plugins/reporting/server/lib/store/mapping.ts
+++ b/x-pack/plugins/reporting/server/lib/store/mapping.ts
@@ -63,4 +63,4 @@ export const mapping = {
content: { type: 'object', enabled: false },
},
},
-};
+} as const;
diff --git a/x-pack/plugins/rollup/server/collectors/helpers.ts b/x-pack/plugins/rollup/server/collectors/helpers.ts
index 3ec457bc6191..1d1a8755aa56 100644
--- a/x-pack/plugins/rollup/server/collectors/helpers.ts
+++ b/x-pack/plugins/rollup/server/collectors/helpers.ts
@@ -81,7 +81,6 @@ const getSavedObjectsList = async ({
ignore_unavailable: true,
index: kibanaIndex,
size: ES_MAX_RESULT_WINDOW_DEFAULT_VALUE,
- // @ts-expect-error@elastic/elasticsearch _source does not exist in type SearchRequest
_source: filterPath,
});
return esResponse;
diff --git a/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts b/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts
index 17eb5ae8967a..74681a6aad4e 100644
--- a/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts
+++ b/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts
@@ -5,11 +5,11 @@
* 2.0.
*/
-import { TypeMapping } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { set } from '@elastic/safer-lodash-set';
import { FieldMap } from './field_map/types';
-export function mappingFromFieldMap(fieldMap: FieldMap): TypeMapping {
+export function mappingFromFieldMap(fieldMap: FieldMap): estypes.MappingTypeMapping {
const mappings = {
dynamic: 'strict' as const,
properties: {},
diff --git a/x-pack/plugins/rule_registry/common/types.ts b/x-pack/plugins/rule_registry/common/types.ts
index 299d2c300ab4..858b1a5af431 100644
--- a/x-pack/plugins/rule_registry/common/types.ts
+++ b/x-pack/plugins/rule_registry/common/types.ts
@@ -7,7 +7,7 @@
import { estypes } from '@elastic/elasticsearch';
-export type PutIndexTemplateRequest = estypes.PutIndexTemplateRequest & {
+export type PutIndexTemplateRequest = estypes.IndicesPutIndexTemplateRequest & {
body?: { composed_of?: string[] };
};
@@ -16,6 +16,6 @@ export interface ClusterPutComponentTemplateBody {
settings: {
number_of_shards: number;
};
- mappings: estypes.TypeMapping;
+ mappings: estypes.MappingTypeMapping;
};
}
diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts
index 96b5860e143e..cb04a442d0b3 100644
--- a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts
@@ -93,6 +93,7 @@ export class IndexManagementGateway {
this.logger.debug(`Updating index template; name="${templateName}"`);
try {
+ // @ts-expect-error settings is optional
const { settings, ...templateWithoutSettings } = template;
const es = await this.elasticsearch;
diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts
index 00fc9131523a..7663ea27fb0d 100644
--- a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts
@@ -8,7 +8,7 @@
import { estypes } from '@elastic/elasticsearch';
export interface IlmPolicy {
- policy: estypes.Policy;
+ policy: estypes.IlmPolicy;
}
export const defaultIlmPolicy: IlmPolicy = {
diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts
index caf71dadf6e1..0045bce3ed87 100644
--- a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts
@@ -9,7 +9,7 @@ import { estypes } from '@elastic/elasticsearch';
import { IndexNames } from './index_names';
import { IndexMappings } from './index_mappings';
-export type IndexTemplate = estypes.PutIndexTemplateRequest['body'];
+export type IndexTemplate = estypes.IndicesPutTemplateRequest['body'];
export const createIndexTemplate = (
names: IndexNames,
@@ -39,6 +39,7 @@ export const createIndexTemplate = (
order: 'desc',
},
},
+ // @ts-expect-error IndexMappings is not assignale to estypes.MappingTypeMapping
mappings: {
...mappings,
_meta: {
diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts
index 48228ce5352b..bf9aca74f780 100644
--- a/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts
@@ -78,8 +78,8 @@ export class EventQueryBuilder implements IEventQueryBuilder {
return new EventQuery({ indexReader, request });
}
- private buildFilter(): estypes.QueryContainer[] {
- const result: estypes.QueryContainer[] = [];
+ private buildFilter(): estypes.QueryDslQueryContainer[] {
+ const result: estypes.QueryDslQueryContainer[] = [];
if (this.loggerName) {
result.push({
diff --git a/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts b/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts
index 7807dd9ca6b3..7dcaee9d382b 100644
--- a/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts
@@ -101,7 +101,7 @@ export interface IEventQueryBuilder {
buildQuery(): IEventQuery;
}
-export type SortingParams = estypes.Sort;
+export type SortingParams = estypes.SearchSort;
export interface PaginationParams {
page: number;
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/index.ts b/x-pack/plugins/rule_registry/server/rule_data_client/index.ts
index 43122ba49519..cd7467c903e5 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/index.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/index.ts
@@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { TypeMapping } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { ResponseError } from '@elastic/elasticsearch/lib/errors';
import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
import {
@@ -125,7 +125,7 @@ export class RuleDataClient implements IRuleDataClient {
path: `/_index_template/_simulate_index/${concreteIndexName}`,
});
- const mappings: TypeMapping = simulateResponse.template.mappings;
+ const mappings: estypes.MappingTypeMapping = simulateResponse.template.mappings;
await clusterClient.indices.putMapping({ index: `${alias}*`, body: mappings });
}
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts
index 159e9b815259..22435ef8c020 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts
@@ -110,7 +110,7 @@ export class RuleDataPluginService {
return clusterClient.indices.putIndexTemplate(template);
}
- private async _createOrUpdateLifecyclePolicy(policy: estypes.PutLifecycleRequest) {
+ private async _createOrUpdateLifecyclePolicy(policy: estypes.IlmPutLifecycleRequest) {
this.assertWriteEnabled();
const clusterClient = await this.getClusterClient();
@@ -130,7 +130,7 @@ export class RuleDataPluginService {
return this._createOrUpdateIndexTemplate(template);
}
- async createOrUpdateLifecyclePolicy(policy: estypes.PutLifecycleRequest) {
+ async createOrUpdateLifecyclePolicy(policy: estypes.IlmPutLifecycleRequest) {
await this.wait();
return this._createOrUpdateLifecyclePolicy(policy);
}
diff --git a/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts b/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts
index e3a586062ae4..29849497e02e 100644
--- a/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts
+++ b/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts
@@ -17,7 +17,10 @@ export function defineGetBuiltinPrivilegesRoutes({ router }: RouteDefinitionPara
// Exclude the `none` privilege, as it doesn't make sense as an option within the Kibana UI
privileges.cluster = privileges.cluster.filter((privilege) => privilege !== 'none');
- privileges.index = privileges.index.filter((privilege) => privilege !== 'none');
+ const indexPriviledges = Array.isArray(privileges.index)
+ ? privileges.index
+ : [privileges.index];
+ privileges.index = indexPriviledges.filter((privilege) => privilege !== 'none');
return response.ok({ body: privileges });
}
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.ts
index 09bcb6b8c505..5a0934721e20 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.ts
@@ -72,7 +72,6 @@ export function definePutRolesRoutes({
const body = transformPutPayloadToElasticsearchRole(
request.body,
authz.applicationName,
- // @ts-expect-error @elastic/elasticsearch `XPackRole` type doesn't define `applications`.
rawRoles[name] ? rawRoles[name].applications : []
);
diff --git a/x-pack/plugins/security/server/session_management/session_index.ts b/x-pack/plugins/security/server/session_management/session_index.ts
index d7a4c3e2520b..9093d5d2e0db 100644
--- a/x-pack/plugins/security/server/session_management/session_index.ts
+++ b/x-pack/plugins/security/server/session_management/session_index.ts
@@ -52,7 +52,7 @@ export function getSessionIndexTemplate(indexName: string) {
},
},
mappings: {
- dynamic: 'strict' as 'strict',
+ dynamic: 'strict',
properties: {
usernameHash: { type: 'keyword' },
provider: { properties: { name: { type: 'keyword' }, type: { type: 'keyword' } } },
@@ -61,7 +61,7 @@ export function getSessionIndexTemplate(indexName: string) {
accessAgreementAcknowledged: { type: 'boolean' },
content: { type: 'binary' },
},
- },
+ } as const,
});
}
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
index 6e508a099003..58e7539b1f61 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
@@ -51,13 +51,16 @@ export class FleetAgentGenerator extends BaseDataGenerator {
* @param [overrides] any partial value to the full document
*/
generateEsHit(
- overrides: DeepPartial> = {}
- ): estypes.Hit {
+ overrides: DeepPartial> = {}
+ ): estypes.SearchHit {
const hostname = this.randomHostname();
const now = new Date().toISOString();
const osFamily = this.randomOSFamily();
- return merge, DeepPartial>>(
+ return merge<
+ estypes.SearchHit,
+ DeepPartial>
+ >(
{
_index: AGENTS_INDEX,
_id: this.randomUUID(),
diff --git a/x-pack/plugins/security_solution/common/endpoint/index_data.ts b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
index 021b9bcb1ecc..4996d90288ca 100644
--- a/x-pack/plugins/security_solution/common/endpoint/index_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
@@ -121,7 +121,7 @@ async function indexHostDocs({
const kibanaVersion = await fetchKibanaVersion(kbnClient);
let hostMetadata: HostMetadata;
let wasAgentEnrolled = false;
- let enrolledAgent: undefined | estypes.Hit;
+ let enrolledAgent: undefined | estypes.SearchHit;
for (let j = 0; j < numDocs; j++) {
generator.updateHostData();
@@ -373,7 +373,7 @@ const indexFleetAgentForHost = async (
endpointHost: HostMetadata,
agentPolicyId: string,
kibanaVersion: string = '8.0.0'
-): Promise> => {
+): Promise> => {
const agentDoc = fleetAgentGenerator.generateEsHit({
_source: {
local_metadata: {
diff --git a/x-pack/plugins/security_solution/common/search_strategy/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
index e27e9b5173fd..4fcfbdac3c1b 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
@@ -70,7 +70,7 @@ export interface PaginationInputPaginated {
querySize: number;
}
-export type DocValueFields = estypes.DocValueField;
+export type DocValueFields = estypes.SearchDocValueField;
export interface Explanation {
value: number;
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
index 34b32115a089..e8578b4c0706 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
@@ -25,5 +25,5 @@ export interface HostDetailsRequestOptions extends Partial {
});
it('properly transforms the response', async () => {
+ // @ts-expect-error mocking only what we need
esClient.indices.getMapping.mockResolvedValue({
body: {
- // @ts-expect-error mocking only what we need
index1: { mappings: { _meta: { version: 3 } } },
},
});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
index 9c40778d4670..00446a204ca8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
@@ -86,7 +86,7 @@ export const applyMigrationCleanupPolicy = async ({
await esClient.indices.putSettings({
index,
body: {
- index: {
+ settings: {
lifecycle: {
name: getMigrationCleanupPolicyName(alias),
},
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts
index 3911dcabc34d..04bfa78f883f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { schema } from '@kbn/config-schema';
import { Logger } from '@kbn/logging';
import { ESSearchRequest } from 'typings/elasticsearch';
@@ -60,7 +60,7 @@ export const createQueryAlertType = (ruleDataClient: RuleDataClient, logger: Log
indexPattern,
{ query: customQuery, language: 'kuery' },
[]
- ) as QueryContainer;
+ ) as estypes.QueryDslQueryContainer;
const query: ESSearchRequest = {
body: {
query: esQuery,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
index 041443958036..7b27d22d9b38 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
@@ -5,7 +5,6 @@
* 2.0.
*/
import type { estypes } from '@elastic/elasticsearch';
-import { SortResults } from '@elastic/elasticsearch/api/types';
import { isEmpty } from 'lodash';
import {
SortOrderOrUndefined,
@@ -13,14 +12,14 @@ import {
} from '../../../../common/detection_engine/schemas/common/schemas';
interface BuildEventsSearchQuery {
- aggregations?: Record;
+ aggregations?: Record;
index: string[];
from: string;
to: string;
- filter: estypes.QueryContainer;
+ filter: estypes.QueryDslQueryContainer;
size: number;
sortOrder?: SortOrderOrUndefined;
- searchAfterSortIds: SortResults | undefined;
+ searchAfterSortIds: estypes.SearchSortResults | undefined;
timestampOverride: TimestampOverrideOrUndefined;
}
@@ -43,7 +42,7 @@ export const buildEventsSearchQuery = ({
format: 'strict_date_optional_time',
}));
- const rangeFilter: estypes.QueryContainer[] =
+ const rangeFilter: estypes.QueryDslQueryContainer[] =
timestampOverride != null
? [
{
@@ -93,7 +92,7 @@ export const buildEventsSearchQuery = ({
},
];
- const filterWithTime: estypes.QueryContainer[] = [
+ const filterWithTime: estypes.QueryDslQueryContainer[] = [
filter,
{ bool: { filter: [{ bool: { should: [...rangeFilter], minimum_should_match: 1 } }] } },
];
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts
index a50d40e33a71..da664f65c2d5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts
@@ -16,7 +16,7 @@ import { FilterEventsOptions } from './types';
export const filterEvents = ({
events,
fieldAndSetTuples,
-}: FilterEventsOptions): Array> => {
+}: FilterEventsOptions): Array> => {
return events.filter((item) => {
return fieldAndSetTuples
.map((tuple) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts
index 5907cbdfb7fd..fffe971753f8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts
@@ -58,9 +58,9 @@ export const filterEventsAgainstList = async ({
return listItem.entries.every((entry) => entriesList.is(entry));
});
- const res = await valueListExceptionItems.reduce>>>(
+ const res = await valueListExceptionItems.reduce>>>(
async (
- filteredAccum: Promise>>,
+ filteredAccum: Promise>>,
exceptionItem: ExceptionListItemSchema
) => {
const events = await filteredAccum;
@@ -78,7 +78,7 @@ export const filterEventsAgainstList = async ({
);
return filteredEvents;
},
- Promise.resolve>>(eventSearchResult.hits.hits)
+ Promise.resolve>>(eventSearchResult.hits.hits)
);
return {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
index 1252ca3f5faa..160506b965bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
@@ -20,7 +20,7 @@ export interface FilterEventsAgainstListOptions {
}
export interface CreateSetToFilterAgainstOptions {
- events: Array>;
+ events: Array>;
field: string;
listId: string;
listType: Type;
@@ -30,12 +30,12 @@ export interface CreateSetToFilterAgainstOptions {
}
export interface FilterEventsOptions {
- events: Array>;
+ events: Array>;
fieldAndSetTuples: FieldSet[];
}
export interface CreateFieldAndSetTuplesOptions {
- events: Array>;
+ events: Array>;
exceptionItem: ExceptionListItemSchema;
listClient: ListClient;
logger: Logger;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts
index 08f8abe384d0..b0dcc1810a63 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts
@@ -6,7 +6,7 @@
*/
import { identity } from 'lodash';
-import { SortResults } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
import { singleSearchAfter } from './single_search_after';
import { singleBulkCreate } from './single_bulk_create';
import { filterEventsAgainstList } from './filters/filter_events_against_list';
@@ -44,7 +44,7 @@ export const searchAfterAndBulkCreate = async ({
let toReturn = createSearchAfterReturnType();
// sortId tells us where to start our next consecutive search_after query
- let sortIds: SortResults | undefined;
+ let sortIds: estypes.SearchSortResults | undefined;
let hasSortId = true; // default to true so we execute the search on initial run
// signalsCreatedCount keeps track of how many signals we have created,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
index 66f7d41df94a..823d694f3651 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
@@ -157,7 +157,7 @@ describe('signal_rule_alert_type', () => {
(mlExecutor as jest.Mock).mockClear();
(mlExecutor as jest.Mock).mockResolvedValue(executorReturnValue);
(parseScheduleDates as jest.Mock).mockReturnValue(moment(100));
- const value: Partial> = {
+ const value: Partial> = {
statusCode: 200,
body: {
indices: ['index1', 'index2', 'index3', 'index4'],
@@ -174,7 +174,7 @@ describe('signal_rule_alert_type', () => {
},
};
alertServices.scopedClusterClient.asCurrentUser.fieldCaps.mockResolvedValue(
- value as ApiResponse
+ value as ApiResponse