diff --git a/src/api/api/bulk.ts b/src/api/api/bulk.ts index 3b4e4ae04..30dfb4995 100644 --- a/src/api/api/bulk.ts +++ b/src/api/api/bulk.ts @@ -41,7 +41,7 @@ export default async function BulkApi (this: That, params: T. export default async function BulkApi (this: That, params: T.BulkRequest | TB.BulkRequest, options?: TransportRequestOptionsWithMeta): Promise> export default async function BulkApi (this: That, params: T.BulkRequest | TB.BulkRequest, options?: TransportRequestOptions): Promise export default async function BulkApi (this: That, params: T.BulkRequest | TB.BulkRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['index', 'type'] + const acceptedPath: string[] = ['index'] const acceptedBody: string[] = ['operations'] const querystring: Record = {} // @ts-expect-error @@ -61,10 +61,7 @@ export default async function BulkApi (this: That, params: T. let method = '' let path = '' - if (params.index != null && params.type != null) { - method = 'POST' - path = `/${encodeURIComponent(params.index.toString())}/${encodeURIComponent(params.type.toString())}/_bulk` - } else if (params.index != null) { + if (params.index != null) { method = 'POST' path = `/${encodeURIComponent(params.index.toString())}/_bulk` } else { diff --git a/src/api/api/create.ts b/src/api/api/create.ts index 31e3fca29..61e3fbc75 100644 --- a/src/api/api/create.ts +++ b/src/api/api/create.ts @@ -41,7 +41,7 @@ export default async function CreateApi (this: That, params export default async function CreateApi (this: That, params: T.CreateRequest | TB.CreateRequest, options?: TransportRequestOptionsWithMeta): Promise> export default async function CreateApi (this: That, params: T.CreateRequest | TB.CreateRequest, options?: TransportRequestOptions): Promise export default async function CreateApi (this: That, params: T.CreateRequest | TB.CreateRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['id', 'index', 'type'] + const acceptedPath: string[] = ['id', 'index'] const acceptedBody: string[] = ['document'] const querystring: Record = {} // @ts-expect-error diff --git a/src/api/api/delete.ts b/src/api/api/delete.ts index ee4dba53b..1f7c06ddf 100644 --- a/src/api/api/delete.ts +++ b/src/api/api/delete.ts @@ -41,7 +41,7 @@ export default async function DeleteApi (this: That, params: T.DeleteRequest | T export default async function DeleteApi (this: That, params: T.DeleteRequest | TB.DeleteRequest, options?: TransportRequestOptionsWithMeta): Promise> export default async function DeleteApi (this: That, params: T.DeleteRequest | TB.DeleteRequest, options?: TransportRequestOptions): Promise export default async function DeleteApi (this: That, params: T.DeleteRequest | TB.DeleteRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['id', 'index', 'type'] + const acceptedPath: string[] = ['id', 'index'] const querystring: Record = {} const body = undefined diff --git a/src/api/api/exists_source.ts b/src/api/api/exists_source.ts index eec41b8cd..590c4f7f1 100644 --- a/src/api/api/exists_source.ts +++ b/src/api/api/exists_source.ts @@ -41,7 +41,7 @@ export default async function ExistsSourceApi (this: That, params: T.ExistsSourc export default async function ExistsSourceApi (this: That, params: T.ExistsSourceRequest | TB.ExistsSourceRequest, options?: TransportRequestOptionsWithMeta): Promise> export default async function ExistsSourceApi (this: That, params: T.ExistsSourceRequest | TB.ExistsSourceRequest, options?: TransportRequestOptions): Promise export default async function ExistsSourceApi (this: That, params: T.ExistsSourceRequest | TB.ExistsSourceRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['id', 'index', 'type'] + const acceptedPath: string[] = ['id', 'index'] const querystring: Record = {} const body = undefined diff --git a/src/api/api/indices.ts b/src/api/api/indices.ts index b6d6a5b00..ad1f8fe3e 100644 --- a/src/api/api/indices.ts +++ b/src/api/api/indices.ts @@ -513,28 +513,6 @@ export default class Indices { return await this.transport.request({ path, method, querystring, body }, options) } - async existsType (this: That, params: T.IndicesExistsTypeRequest | TB.IndicesExistsTypeRequest, options?: TransportRequestOptionsWithOutMeta): Promise - async existsType (this: That, params: T.IndicesExistsTypeRequest | TB.IndicesExistsTypeRequest, options?: TransportRequestOptionsWithMeta): Promise> - async existsType (this: That, params: T.IndicesExistsTypeRequest | TB.IndicesExistsTypeRequest, options?: TransportRequestOptions): Promise - async existsType (this: That, params: T.IndicesExistsTypeRequest | TB.IndicesExistsTypeRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['index', 'type'] - const querystring: Record = {} - const body = undefined - - for (const key in params) { - if (acceptedPath.includes(key)) { - continue - } else if (key !== 'body') { - // @ts-expect-error - querystring[key] = params[key] - } - } - - const method = 'HEAD' - const path = `/${encodeURIComponent(params.index.toString())}/_mapping/${encodeURIComponent(params.type.toString())}` - return await this.transport.request({ path, method, querystring, body }, options) - } - async fieldUsageStats (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise async fieldUsageStats (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> async fieldUsageStats (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise @@ -1563,7 +1541,7 @@ export default class Indices { async validateQuery (this: That, params?: T.IndicesValidateQueryRequest | TB.IndicesValidateQueryRequest, options?: TransportRequestOptionsWithMeta): Promise> async validateQuery (this: That, params?: T.IndicesValidateQueryRequest | TB.IndicesValidateQueryRequest, options?: TransportRequestOptions): Promise async validateQuery (this: That, params?: T.IndicesValidateQueryRequest | TB.IndicesValidateQueryRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['index', 'type'] + const acceptedPath: string[] = ['index'] const acceptedBody: string[] = ['query'] const querystring: Record = {} // @ts-expect-error diff --git a/src/api/api/ml.ts b/src/api/api/ml.ts index 500f38024..0cbe94600 100644 --- a/src/api/api/ml.ts +++ b/src/api/api/ml.ts @@ -937,6 +937,28 @@ export default class Ml { return await this.transport.request({ path, method, querystring, body }, options) } + async getModelSnapshotUpgradeStats (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise + async getModelSnapshotUpgradeStats (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> + async getModelSnapshotUpgradeStats (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise + async getModelSnapshotUpgradeStats (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise { + const acceptedPath: string[] = ['job_id', 'snapshot_id'] + const querystring: Record = {} + const body = undefined + + params = params ?? {} + for (const key in params) { + if (acceptedPath.includes(key)) { + continue + } else if (key !== 'body') { + querystring[key] = params[key] + } + } + + const method = 'GET' + const path = `/_ml/anomaly_detectors/${encodeURIComponent(params.job_id.toString())}/model_snapshots/${encodeURIComponent(params.snapshot_id.toString())}/_upgrade/_stats` + return await this.transport.request({ path, method, querystring, body }, options) + } + async getModelSnapshots (this: That, params: T.MlGetModelSnapshotsRequest | TB.MlGetModelSnapshotsRequest, options?: TransportRequestOptionsWithOutMeta): Promise async getModelSnapshots (this: That, params: T.MlGetModelSnapshotsRequest | TB.MlGetModelSnapshotsRequest, options?: TransportRequestOptionsWithMeta): Promise> async getModelSnapshots (this: That, params: T.MlGetModelSnapshotsRequest | TB.MlGetModelSnapshotsRequest, options?: TransportRequestOptions): Promise @@ -1106,19 +1128,31 @@ export default class Ml { return await this.transport.request({ path, method, querystring, body }, options) } - async inferTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise - async inferTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> - async inferTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise - async inferTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise { + async inferTrainedModelDeployment (this: That, params: T.MlInferTrainedModelDeploymentRequest | TB.MlInferTrainedModelDeploymentRequest, options?: TransportRequestOptionsWithOutMeta): Promise + async inferTrainedModelDeployment (this: That, params: T.MlInferTrainedModelDeploymentRequest | TB.MlInferTrainedModelDeploymentRequest, options?: TransportRequestOptionsWithMeta): Promise> + async inferTrainedModelDeployment (this: That, params: T.MlInferTrainedModelDeploymentRequest | TB.MlInferTrainedModelDeploymentRequest, options?: TransportRequestOptions): Promise + async inferTrainedModelDeployment (this: That, params: T.MlInferTrainedModelDeploymentRequest | TB.MlInferTrainedModelDeploymentRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['model_id'] + const acceptedBody: string[] = ['docs'] const querystring: Record = {} - const body = undefined + // @ts-expect-error + const userBody: any = params?.body + let body: Record | string + if (typeof userBody === 'string') { + body = userBody + } else { + body = userBody != null ? { ...userBody } : undefined + } - params = params ?? {} for (const key in params) { - if (acceptedPath.includes(key)) { + if (acceptedBody.includes(key)) { + body = body ?? {} + // @ts-expect-error + body[key] = params[key] + } else if (acceptedPath.includes(key)) { continue } else if (key !== 'body') { + // @ts-expect-error querystring[key] = params[key] } } @@ -1578,19 +1612,31 @@ export default class Ml { return await this.transport.request({ path, method, querystring, body }, options) } - async putTrainedModelDefinitionPart (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise - async putTrainedModelDefinitionPart (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> - async putTrainedModelDefinitionPart (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise - async putTrainedModelDefinitionPart (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise { + async putTrainedModelDefinitionPart (this: That, params: T.MlPutTrainedModelDefinitionPartRequest | TB.MlPutTrainedModelDefinitionPartRequest, options?: TransportRequestOptionsWithOutMeta): Promise + async putTrainedModelDefinitionPart (this: That, params: T.MlPutTrainedModelDefinitionPartRequest | TB.MlPutTrainedModelDefinitionPartRequest, options?: TransportRequestOptionsWithMeta): Promise> + async putTrainedModelDefinitionPart (this: That, params: T.MlPutTrainedModelDefinitionPartRequest | TB.MlPutTrainedModelDefinitionPartRequest, options?: TransportRequestOptions): Promise + async putTrainedModelDefinitionPart (this: That, params: T.MlPutTrainedModelDefinitionPartRequest | TB.MlPutTrainedModelDefinitionPartRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['model_id', 'part'] + const acceptedBody: string[] = ['definition', 'total_definition_length', 'total_parts'] const querystring: Record = {} - const body = undefined + // @ts-expect-error + const userBody: any = params?.body + let body: Record | string + if (typeof userBody === 'string') { + body = userBody + } else { + body = userBody != null ? { ...userBody } : undefined + } - params = params ?? {} for (const key in params) { - if (acceptedPath.includes(key)) { + if (acceptedBody.includes(key)) { + body = body ?? {} + // @ts-expect-error + body[key] = params[key] + } else if (acceptedPath.includes(key)) { continue } else if (key !== 'body') { + // @ts-expect-error querystring[key] = params[key] } } @@ -1600,19 +1646,31 @@ export default class Ml { return await this.transport.request({ path, method, querystring, body }, options) } - async putTrainedModelVocabulary (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise - async putTrainedModelVocabulary (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> - async putTrainedModelVocabulary (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise - async putTrainedModelVocabulary (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise { + async putTrainedModelVocabulary (this: That, params: T.MlPutTrainedModelVocabularyRequest | TB.MlPutTrainedModelVocabularyRequest, options?: TransportRequestOptionsWithOutMeta): Promise + async putTrainedModelVocabulary (this: That, params: T.MlPutTrainedModelVocabularyRequest | TB.MlPutTrainedModelVocabularyRequest, options?: TransportRequestOptionsWithMeta): Promise> + async putTrainedModelVocabulary (this: That, params: T.MlPutTrainedModelVocabularyRequest | TB.MlPutTrainedModelVocabularyRequest, options?: TransportRequestOptions): Promise + async putTrainedModelVocabulary (this: That, params: T.MlPutTrainedModelVocabularyRequest | TB.MlPutTrainedModelVocabularyRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['model_id'] + const acceptedBody: string[] = ['vocabulary'] const querystring: Record = {} - const body = undefined + // @ts-expect-error + const userBody: any = params?.body + let body: Record | string + if (typeof userBody === 'string') { + body = userBody + } else { + body = userBody != null ? { ...userBody } : undefined + } - params = params ?? {} for (const key in params) { - if (acceptedPath.includes(key)) { + if (acceptedBody.includes(key)) { + body = body ?? {} + // @ts-expect-error + body[key] = params[key] + } else if (acceptedPath.includes(key)) { continue } else if (key !== 'body') { + // @ts-expect-error querystring[key] = params[key] } } @@ -1757,19 +1815,19 @@ export default class Ml { return await this.transport.request({ path, method, querystring, body }, options) } - async startTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise - async startTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> - async startTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise - async startTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise { + async startTrainedModelDeployment (this: That, params: T.MlStartTrainedModelDeploymentRequest | TB.MlStartTrainedModelDeploymentRequest, options?: TransportRequestOptionsWithOutMeta): Promise + async startTrainedModelDeployment (this: That, params: T.MlStartTrainedModelDeploymentRequest | TB.MlStartTrainedModelDeploymentRequest, options?: TransportRequestOptionsWithMeta): Promise> + async startTrainedModelDeployment (this: That, params: T.MlStartTrainedModelDeploymentRequest | TB.MlStartTrainedModelDeploymentRequest, options?: TransportRequestOptions): Promise + async startTrainedModelDeployment (this: That, params: T.MlStartTrainedModelDeploymentRequest | TB.MlStartTrainedModelDeploymentRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['model_id'] const querystring: Record = {} const body = undefined - params = params ?? {} for (const key in params) { if (acceptedPath.includes(key)) { continue } else if (key !== 'body') { + // @ts-expect-error querystring[key] = params[key] } } @@ -1835,19 +1893,19 @@ export default class Ml { return await this.transport.request({ path, method, querystring, body }, options) } - async stopTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise - async stopTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> - async stopTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise - async stopTrainedModelDeployment (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise { + async stopTrainedModelDeployment (this: That, params: T.MlStopTrainedModelDeploymentRequest | TB.MlStopTrainedModelDeploymentRequest, options?: TransportRequestOptionsWithOutMeta): Promise + async stopTrainedModelDeployment (this: That, params: T.MlStopTrainedModelDeploymentRequest | TB.MlStopTrainedModelDeploymentRequest, options?: TransportRequestOptionsWithMeta): Promise> + async stopTrainedModelDeployment (this: That, params: T.MlStopTrainedModelDeploymentRequest | TB.MlStopTrainedModelDeploymentRequest, options?: TransportRequestOptions): Promise + async stopTrainedModelDeployment (this: That, params: T.MlStopTrainedModelDeploymentRequest | TB.MlStopTrainedModelDeploymentRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['model_id'] const querystring: Record = {} const body = undefined - params = params ?? {} for (const key in params) { if (acceptedPath.includes(key)) { continue } else if (key !== 'body') { + // @ts-expect-error querystring[key] = params[key] } } diff --git a/src/api/api/msearch.ts b/src/api/api/msearch.ts index 67139b26e..523885cd3 100644 --- a/src/api/api/msearch.ts +++ b/src/api/api/msearch.ts @@ -37,10 +37,10 @@ import * as T from '../types' import * as TB from '../typesWithBodyKey' interface That { transport: Transport } -export default async function MsearchApi (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise> -export default async function MsearchApi (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> -export default async function MsearchApi (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptions): Promise> -export default async function MsearchApi (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptions): Promise { +export default async function MsearchApi> (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise> +export default async function MsearchApi> (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> +export default async function MsearchApi> (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptions): Promise> +export default async function MsearchApi> (this: That, params: T.MsearchRequest | TB.MsearchRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['index'] const acceptedBody: string[] = ['searches'] const querystring: Record = {} diff --git a/src/api/api/msearch_template.ts b/src/api/api/msearch_template.ts index 8cd92bcb7..ea9f3dfd7 100644 --- a/src/api/api/msearch_template.ts +++ b/src/api/api/msearch_template.ts @@ -37,10 +37,10 @@ import * as T from '../types' import * as TB from '../typesWithBodyKey' interface That { transport: Transport } -export default async function MsearchTemplateApi (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise> -export default async function MsearchTemplateApi (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> -export default async function MsearchTemplateApi (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptions): Promise> -export default async function MsearchTemplateApi (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptions): Promise { +export default async function MsearchTemplateApi> (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise> +export default async function MsearchTemplateApi> (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> +export default async function MsearchTemplateApi> (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptions): Promise> +export default async function MsearchTemplateApi> (this: That, params: T.MsearchTemplateRequest | TB.MsearchTemplateRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['index'] const acceptedBody: string[] = ['search_templates'] const querystring: Record = {} diff --git a/src/api/api/rollup.ts b/src/api/api/rollup.ts index cf9ed6ac8..4e19528ed 100644 --- a/src/api/api/rollup.ts +++ b/src/api/api/rollup.ts @@ -208,11 +208,11 @@ export default class Rollup { return await this.transport.request({ path, method, querystring, body }, options) } - async rollupSearch (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise> - async rollupSearch (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> - async rollupSearch (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptions): Promise> - async rollupSearch (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['index', 'type'] + async rollupSearch> (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise> + async rollupSearch> (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> + async rollupSearch> (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptions): Promise> + async rollupSearch> (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptions): Promise { + const acceptedPath: string[] = ['index'] const acceptedBody: string[] = ['aggregations', 'aggs', 'query', 'size'] const querystring: Record = {} // @ts-expect-error diff --git a/src/api/api/scroll.ts b/src/api/api/scroll.ts index c35577d1d..e04fd9aba 100644 --- a/src/api/api/scroll.ts +++ b/src/api/api/scroll.ts @@ -37,10 +37,10 @@ import * as T from '../types' import * as TB from '../typesWithBodyKey' interface That { transport: Transport } -export default async function ScrollApi (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptionsWithOutMeta): Promise> -export default async function ScrollApi (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> -export default async function ScrollApi (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptions): Promise> -export default async function ScrollApi (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptions): Promise { +export default async function ScrollApi> (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptionsWithOutMeta): Promise> +export default async function ScrollApi> (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> +export default async function ScrollApi> (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptions): Promise> +export default async function ScrollApi> (this: That, params: T.ScrollRequest | TB.ScrollRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = [] const acceptedBody: string[] = ['scroll', 'scroll_id'] const querystring: Record = {} diff --git a/src/api/api/search.ts b/src/api/api/search.ts index 754e7b9f9..0ab920b9e 100644 --- a/src/api/api/search.ts +++ b/src/api/api/search.ts @@ -37,10 +37,10 @@ import * as T from '../types' import * as TB from '../typesWithBodyKey' interface That { transport: Transport } -export default async function SearchApi (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise> -export default async function SearchApi (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> -export default async function SearchApi (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptions): Promise> -export default async function SearchApi (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptions): Promise { +export default async function SearchApi> (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise> +export default async function SearchApi> (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> +export default async function SearchApi> (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptions): Promise> +export default async function SearchApi> (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['index'] const acceptedBody: string[] = ['aggregations', 'aggs', 'collapse', 'explain', 'from', 'highlight', 'track_total_hits', 'indices_boost', 'docvalue_fields', 'min_score', 'post_filter', 'profile', 'query', 'rescore', 'script_fields', 'search_after', 'size', 'slice', 'sort', '_source', 'fields', 'suggest', 'terminate_after', 'timeout', 'track_scores', 'version', 'seq_no_primary_term', 'stored_fields', 'pit', 'runtime_mappings', 'stats'] const querystring: Record = {} diff --git a/src/api/api/transform.ts b/src/api/api/transform.ts index 1edbc932c..beef02852 100644 --- a/src/api/api/transform.ts +++ b/src/api/api/transform.ts @@ -164,7 +164,7 @@ export default class Transform { async putTransform (this: That, params: T.TransformPutTransformRequest | TB.TransformPutTransformRequest, options?: TransportRequestOptions): Promise async putTransform (this: That, params: T.TransformPutTransformRequest | TB.TransformPutTransformRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = ['transform_id'] - const acceptedBody: string[] = ['dest', 'description', 'frequency', 'pivot', 'source', 'settings', 'sync', 'retention_policy', 'latest'] + const acceptedBody: string[] = ['dest', 'description', 'frequency', 'latest', '_meta', 'pivot', 'retention_policy', 'settings', 'source', 'sync'] const querystring: Record = {} // @ts-expect-error const userBody: any = params?.body @@ -193,6 +193,28 @@ export default class Transform { return await this.transport.request({ path, method, querystring, body }, options) } + async resetTransform (this: That, params: T.TransformResetTransformRequest | TB.TransformResetTransformRequest, options?: TransportRequestOptionsWithOutMeta): Promise + async resetTransform (this: That, params: T.TransformResetTransformRequest | TB.TransformResetTransformRequest, options?: TransportRequestOptionsWithMeta): Promise> + async resetTransform (this: That, params: T.TransformResetTransformRequest | TB.TransformResetTransformRequest, options?: TransportRequestOptions): Promise + async resetTransform (this: That, params: T.TransformResetTransformRequest | TB.TransformResetTransformRequest, options?: TransportRequestOptions): Promise { + const acceptedPath: string[] = ['transform_id'] + const querystring: Record = {} + const body = undefined + + for (const key in params) { + if (acceptedPath.includes(key)) { + continue + } else if (key !== 'body') { + // @ts-expect-error + querystring[key] = params[key] + } + } + + const method = 'POST' + const path = `/_transform/${encodeURIComponent(params.transform_id.toString())}/_reset` + return await this.transport.request({ path, method, querystring, body }, options) + } + async startTransform (this: That, params: T.TransformStartTransformRequest | TB.TransformStartTransformRequest, options?: TransportRequestOptionsWithOutMeta): Promise async startTransform (this: That, params: T.TransformStartTransformRequest | TB.TransformStartTransformRequest, options?: TransportRequestOptionsWithMeta): Promise> async startTransform (this: That, params: T.TransformStartTransformRequest | TB.TransformStartTransformRequest, options?: TransportRequestOptions): Promise @@ -271,10 +293,10 @@ export default class Transform { return await this.transport.request({ path, method, querystring, body }, options) } - async upgradeTransforms (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise - async upgradeTransforms (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise> - async upgradeTransforms (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise - async upgradeTransforms (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise { + async upgradeTransforms (this: That, params?: T.TransformUpgradeTransformsRequest | TB.TransformUpgradeTransformsRequest, options?: TransportRequestOptionsWithOutMeta): Promise + async upgradeTransforms (this: That, params?: T.TransformUpgradeTransformsRequest | TB.TransformUpgradeTransformsRequest, options?: TransportRequestOptionsWithMeta): Promise> + async upgradeTransforms (this: That, params?: T.TransformUpgradeTransformsRequest | TB.TransformUpgradeTransformsRequest, options?: TransportRequestOptions): Promise + async upgradeTransforms (this: That, params?: T.TransformUpgradeTransformsRequest | TB.TransformUpgradeTransformsRequest, options?: TransportRequestOptions): Promise { const acceptedPath: string[] = [] const querystring: Record = {} const body = undefined @@ -284,6 +306,7 @@ export default class Transform { if (acceptedPath.includes(key)) { continue } else if (key !== 'body') { + // @ts-expect-error querystring[key] = params[key] } } diff --git a/src/api/api/update.ts b/src/api/api/update.ts index a38f31c22..52be55709 100644 --- a/src/api/api/update.ts +++ b/src/api/api/update.ts @@ -41,7 +41,7 @@ export default async function UpdateApi (this: That, params: T.UpdateRequest | TB.UpdateRequest, options?: TransportRequestOptionsWithMeta): Promise, unknown>> export default async function UpdateApi (this: That, params: T.UpdateRequest | TB.UpdateRequest, options?: TransportRequestOptions): Promise> export default async function UpdateApi (this: That, params: T.UpdateRequest | TB.UpdateRequest, options?: TransportRequestOptions): Promise { - const acceptedPath: string[] = ['id', 'index', 'type'] + const acceptedPath: string[] = ['id', 'index'] const acceptedBody: string[] = ['detect_noop', 'doc', 'doc_as_upsert', 'script', 'scripted_upsert', '_source', 'upsert'] const querystring: Record = {} // @ts-expect-error diff --git a/src/api/kibana.ts b/src/api/kibana.ts index 2e06a7d6d..226314932 100644 --- a/src/api/kibana.ts +++ b/src/api/kibana.ts @@ -203,7 +203,6 @@ interface KibanaClient { existsAlias: (params: T.IndicesExistsAliasRequest| TB.IndicesExistsAliasRequest, options?: TransportRequestOptions) => Promise> existsIndexTemplate: (params: T.IndicesExistsIndexTemplateRequest| TB.IndicesExistsIndexTemplateRequest, options?: TransportRequestOptions) => Promise> existsTemplate: (params: T.IndicesExistsTemplateRequest| TB.IndicesExistsTemplateRequest, options?: TransportRequestOptions) => Promise> - existsType: (params: T.IndicesExistsTypeRequest| TB.IndicesExistsTypeRequest, options?: TransportRequestOptions) => Promise> fieldUsageStats: (params?: T.TODO, options?: TransportRequestOptions) => Promise> flush: (params?: T.IndicesFlushRequest| TB.IndicesFlushRequest, options?: TransportRequestOptions) => Promise> forcemerge: (params?: T.IndicesForcemergeRequest| TB.IndicesForcemergeRequest, options?: TransportRequestOptions) => Promise> @@ -301,12 +300,13 @@ interface KibanaClient { getInfluencers: (params: T.MlGetInfluencersRequest| TB.MlGetInfluencersRequest, options?: TransportRequestOptions) => Promise> getJobStats: (params?: T.MlGetJobStatsRequest| TB.MlGetJobStatsRequest, options?: TransportRequestOptions) => Promise> getJobs: (params?: T.MlGetJobsRequest| TB.MlGetJobsRequest, options?: TransportRequestOptions) => Promise> + getModelSnapshotUpgradeStats: (params?: T.TODO, options?: TransportRequestOptions) => Promise> getModelSnapshots: (params: T.MlGetModelSnapshotsRequest| TB.MlGetModelSnapshotsRequest, options?: TransportRequestOptions) => Promise> getOverallBuckets: (params: T.MlGetOverallBucketsRequest| TB.MlGetOverallBucketsRequest, options?: TransportRequestOptions) => Promise> getRecords: (params: T.MlGetRecordsRequest| TB.MlGetRecordsRequest, options?: TransportRequestOptions) => Promise> getTrainedModels: (params?: T.MlGetTrainedModelsRequest| TB.MlGetTrainedModelsRequest, options?: TransportRequestOptions) => Promise> getTrainedModelsStats: (params?: T.MlGetTrainedModelsStatsRequest| TB.MlGetTrainedModelsStatsRequest, options?: TransportRequestOptions) => Promise> - inferTrainedModelDeployment: (params?: T.TODO, options?: TransportRequestOptions) => Promise> + inferTrainedModelDeployment: (params: T.MlInferTrainedModelDeploymentRequest| TB.MlInferTrainedModelDeploymentRequest, options?: TransportRequestOptions) => Promise> info: (params?: T.MlInfoRequest| TB.MlInfoRequest, options?: TransportRequestOptions) => Promise> openJob: (params: T.MlOpenJobRequest| TB.MlOpenJobRequest, options?: TransportRequestOptions) => Promise> postCalendarEvents: (params: T.MlPostCalendarEventsRequest| TB.MlPostCalendarEventsRequest, options?: TransportRequestOptions) => Promise> @@ -321,17 +321,17 @@ interface KibanaClient { putJob: (params: T.MlPutJobRequest| TB.MlPutJobRequest, options?: TransportRequestOptions) => Promise> putTrainedModel: (params: T.MlPutTrainedModelRequest| TB.MlPutTrainedModelRequest, options?: TransportRequestOptions) => Promise> putTrainedModelAlias: (params: T.MlPutTrainedModelAliasRequest| TB.MlPutTrainedModelAliasRequest, options?: TransportRequestOptions) => Promise> - putTrainedModelDefinitionPart: (params?: T.TODO, options?: TransportRequestOptions) => Promise> - putTrainedModelVocabulary: (params?: T.TODO, options?: TransportRequestOptions) => Promise> + putTrainedModelDefinitionPart: (params: T.MlPutTrainedModelDefinitionPartRequest| TB.MlPutTrainedModelDefinitionPartRequest, options?: TransportRequestOptions) => Promise> + putTrainedModelVocabulary: (params: T.MlPutTrainedModelVocabularyRequest| TB.MlPutTrainedModelVocabularyRequest, options?: TransportRequestOptions) => Promise> resetJob: (params: T.MlResetJobRequest| TB.MlResetJobRequest, options?: TransportRequestOptions) => Promise> revertModelSnapshot: (params: T.MlRevertModelSnapshotRequest| TB.MlRevertModelSnapshotRequest, options?: TransportRequestOptions) => Promise> setUpgradeMode: (params?: T.MlSetUpgradeModeRequest| TB.MlSetUpgradeModeRequest, options?: TransportRequestOptions) => Promise> startDataFrameAnalytics: (params: T.MlStartDataFrameAnalyticsRequest| TB.MlStartDataFrameAnalyticsRequest, options?: TransportRequestOptions) => Promise> startDatafeed: (params: T.MlStartDatafeedRequest| TB.MlStartDatafeedRequest, options?: TransportRequestOptions) => Promise> - startTrainedModelDeployment: (params?: T.TODO, options?: TransportRequestOptions) => Promise> + startTrainedModelDeployment: (params: T.MlStartTrainedModelDeploymentRequest| TB.MlStartTrainedModelDeploymentRequest, options?: TransportRequestOptions) => Promise> stopDataFrameAnalytics: (params: T.MlStopDataFrameAnalyticsRequest| TB.MlStopDataFrameAnalyticsRequest, options?: TransportRequestOptions) => Promise> stopDatafeed: (params: T.MlStopDatafeedRequest| TB.MlStopDatafeedRequest, options?: TransportRequestOptions) => Promise> - stopTrainedModelDeployment: (params?: T.TODO, options?: TransportRequestOptions) => Promise> + stopTrainedModelDeployment: (params: T.MlStopTrainedModelDeploymentRequest| TB.MlStopTrainedModelDeploymentRequest, options?: TransportRequestOptions) => Promise> updateDataFrameAnalytics: (params: T.MlUpdateDataFrameAnalyticsRequest| TB.MlUpdateDataFrameAnalyticsRequest, options?: TransportRequestOptions) => Promise> updateDatafeed: (params: T.MlUpdateDatafeedRequest| TB.MlUpdateDatafeedRequest, options?: TransportRequestOptions) => Promise> updateFilter: (params: T.MlUpdateFilterRequest| TB.MlUpdateFilterRequest, options?: TransportRequestOptions) => Promise> @@ -344,8 +344,8 @@ interface KibanaClient { monitoring: { bulk: (params: T.MonitoringBulkRequest| TB.MonitoringBulkRequest, options?: TransportRequestOptions) => Promise> } - msearch: (params?: T.MsearchRequest| TB.MsearchRequest, options?: TransportRequestOptions) => Promise, TContext>> - msearchTemplate: (params?: T.MsearchTemplateRequest| TB.MsearchTemplateRequest, options?: TransportRequestOptions) => Promise, TContext>> + msearch: (params?: T.MsearchRequest| TB.MsearchRequest, options?: TransportRequestOptions) => Promise, TContext>> + msearchTemplate: (params?: T.MsearchTemplateRequest| TB.MsearchTemplateRequest, options?: TransportRequestOptions) => Promise, TContext>> mtermvectors: (params?: T.MtermvectorsRequest| TB.MtermvectorsRequest, options?: TransportRequestOptions) => Promise> nodes: { clearRepositoriesMeteringArchive: (params?: T.TODO, options?: TransportRequestOptions) => Promise> @@ -370,13 +370,13 @@ interface KibanaClient { getRollupIndexCaps: (params: T.RollupGetRollupIndexCapsRequest| TB.RollupGetRollupIndexCapsRequest, options?: TransportRequestOptions) => Promise> putJob: (params: T.RollupPutJobRequest| TB.RollupPutJobRequest, options?: TransportRequestOptions) => Promise> rollup: (params: T.RollupRollupRequest| TB.RollupRollupRequest, options?: TransportRequestOptions) => Promise> - rollupSearch: (params: T.RollupRollupSearchRequest| TB.RollupRollupSearchRequest, options?: TransportRequestOptions) => Promise, TContext>> + rollupSearch: (params: T.RollupRollupSearchRequest| TB.RollupRollupSearchRequest, options?: TransportRequestOptions) => Promise, TContext>> startJob: (params: T.RollupStartJobRequest| TB.RollupStartJobRequest, options?: TransportRequestOptions) => Promise> stopJob: (params: T.RollupStopJobRequest| TB.RollupStopJobRequest, options?: TransportRequestOptions) => Promise> } scriptsPainlessExecute: (params?: T.ScriptsPainlessExecuteRequest| TB.ScriptsPainlessExecuteRequest, options?: TransportRequestOptions) => Promise, TContext>> - scroll: (params?: T.ScrollRequest| TB.ScrollRequest, options?: TransportRequestOptions) => Promise, TContext>> - search: (params?: T.SearchRequest| TB.SearchRequest, options?: TransportRequestOptions) => Promise, TContext>> + scroll: (params?: T.ScrollRequest| TB.ScrollRequest, options?: TransportRequestOptions) => Promise, TContext>> + search: (params?: T.SearchRequest| TB.SearchRequest, options?: TransportRequestOptions) => Promise, TContext>> searchMvt: (params: T.SearchMvtRequest| TB.SearchMvtRequest, options?: TransportRequestOptions) => Promise> searchShards: (params?: T.SearchShardsRequest| TB.SearchShardsRequest, options?: TransportRequestOptions) => Promise> searchTemplate: (params?: T.SearchTemplateRequest| TB.SearchTemplateRequest, options?: TransportRequestOptions) => Promise, TContext>> @@ -488,10 +488,11 @@ interface KibanaClient { getTransformStats: (params: T.TransformGetTransformStatsRequest| TB.TransformGetTransformStatsRequest, options?: TransportRequestOptions) => Promise> previewTransform: (params?: T.TransformPreviewTransformRequest| TB.TransformPreviewTransformRequest, options?: TransportRequestOptions) => Promise, TContext>> putTransform: (params: T.TransformPutTransformRequest| TB.TransformPutTransformRequest, options?: TransportRequestOptions) => Promise> + resetTransform: (params: T.TransformResetTransformRequest| TB.TransformResetTransformRequest, options?: TransportRequestOptions) => Promise> startTransform: (params: T.TransformStartTransformRequest| TB.TransformStartTransformRequest, options?: TransportRequestOptions) => Promise> stopTransform: (params: T.TransformStopTransformRequest| TB.TransformStopTransformRequest, options?: TransportRequestOptions) => Promise> updateTransform: (params: T.TransformUpdateTransformRequest| TB.TransformUpdateTransformRequest, options?: TransportRequestOptions) => Promise> - upgradeTransforms: (params?: T.TODO, options?: TransportRequestOptions) => Promise> + upgradeTransforms: (params?: T.TransformUpgradeTransformsRequest| TB.TransformUpgradeTransformsRequest, options?: TransportRequestOptions) => Promise> } update: (params: T.UpdateRequest| TB.UpdateRequest, options?: TransportRequestOptions) => Promise, TContext>> updateByQuery: (params: T.UpdateByQueryRequest| TB.UpdateByQueryRequest, options?: TransportRequestOptions) => Promise> diff --git a/src/api/types.ts b/src/api/types.ts index d4100af9c..b06fa5ce7 100644 --- a/src/api/types.ts +++ b/src/api/types.ts @@ -58,7 +58,6 @@ export type BulkOperationType = 'index' | 'create' | 'update' | 'delete' export interface BulkRequest extends RequestBase { index?: IndexName - type?: Type pipeline?: string refresh?: Refresh routing?: Routing @@ -87,7 +86,6 @@ export interface BulkResponseItem { result?: string _seq_no?: SequenceNumber _shards?: ShardStatistics - _type?: string _version?: VersionNumber forced_refresh?: boolean get?: InlineGet> @@ -149,7 +147,6 @@ export interface CountResponse { export interface CreateRequest extends RequestBase { id: Id index: IndexName - type?: Type pipeline?: string refresh?: Refresh routing?: Routing @@ -166,7 +163,6 @@ export interface CreateResponse extends WriteResponseBase { export interface DeleteRequest extends RequestBase { id: Id index: IndexName - type?: Type if_primary_term?: long if_seq_no?: SequenceNumber refresh?: Refresh @@ -203,12 +199,8 @@ export interface DeleteByQueryRequest extends RequestBase { scroll_size?: long search_timeout?: Time search_type?: SearchType - size?: long slices?: long sort?: string[] - _source?: SearchSourceConfigParam - _source_excludes?: Fields - _source_includes?: Fields stats?: string[] terminate_after?: long timeout?: Time @@ -273,7 +265,6 @@ export type ExistsResponse = boolean export interface ExistsSourceRequest extends RequestBase { id: Id index: IndexName - type?: Type preference?: string realtime?: boolean refresh?: boolean @@ -319,7 +310,6 @@ export interface ExplainRequest extends RequestBase { export interface ExplainResponse { _index: IndexName - _type?: Type _id: Id matched: boolean explanation?: ExplainExplanationDetail @@ -362,7 +352,6 @@ export interface GetGetResult { _routing?: string _seq_no?: SequenceNumber _source?: TDocument - _type?: Type _version?: VersionNumber } @@ -510,7 +499,6 @@ export interface MgetMultiGetError { error: ErrorCause _id: Id _index: IndexName - _type?: Type } export interface MgetOperation { @@ -519,7 +507,6 @@ export interface MgetOperation { routing?: Routing _source?: SearchSourceConfig stored_fields?: Fields - _type?: Type version?: VersionNumber version_type?: VersionType } @@ -593,7 +580,7 @@ export interface MsearchRequest extends RequestBase { export type MsearchRequestItem = MsearchMultisearchHeader | MsearchMultisearchBody -export type MsearchResponse = MsearchMultiSearchResult +export type MsearchResponse> = MsearchMultiSearchResult export type MsearchResponseItem = MsearchMultiSearchItem | ErrorResponseBase @@ -609,7 +596,7 @@ export interface MsearchTemplateRequest extends RequestBase { export type MsearchTemplateRequestItem = MsearchMultisearchHeader | MsearchTemplateTemplateConfig -export type MsearchTemplateResponse = MsearchMultiSearchResult +export type MsearchTemplateResponse> = MsearchMultiSearchResult export interface MsearchTemplateTemplateConfig { explain?: boolean @@ -700,7 +687,6 @@ export interface RankEvalDocumentRating { export interface RankEvalRankEvalHit { _id: Id _index: IndexName - _type?: Type _score: double } @@ -842,7 +828,7 @@ export interface ReindexSource { remote?: ReindexRemoteSource size?: integer slice?: SlicedScroll - sort?: SearchSort + sort?: Sort _source?: Fields runtime_mappings?: MappingRuntimeFields } @@ -920,7 +906,7 @@ export interface ScrollRequest extends RequestBase { rest_total_hits_as_int?: boolean } -export interface ScrollResponse extends SearchResponse { +export interface ScrollResponse> extends SearchResponse { } export interface SearchRequest extends RequestBase { @@ -979,7 +965,7 @@ export interface SearchRequest extends RequestBase { query?: QueryDslQueryContainer rescore?: SearchRescore | SearchRescore[] script_fields?: Record - search_after?: SearchSortResults + search_after?: SortResults slice?: SlicedScroll fields?: (QueryDslFieldAndFormat | Field)[] suggest?: SearchSuggester @@ -987,14 +973,13 @@ export interface SearchRequest extends RequestBase { runtime_mappings?: MappingRuntimeFields } -export interface SearchResponse { +export interface SearchResponse> { took: long timed_out: boolean _shards: ShardStatistics hits: SearchHitsMetadata - aggregations?: Record + aggregations?: TAggregations _clusters?: ClusterStatistics - documents?: TDocument[] fields?: Record max_score?: double num_reduce_phases?: long @@ -1093,7 +1078,6 @@ export interface SearchCompletionSuggestOption { fields?: Record _id: string _index: IndexName - _type?: Type _routing?: Routing _score: double _source: TDocument @@ -1153,18 +1137,6 @@ export interface SearchFieldCollapse { max_concurrent_group_searches?: integer } -export interface SearchFieldSort { - missing?: AggregationsMissing - mode?: SearchSortMode - nested?: SearchNestedSortValue - order?: SearchSortOrder - unmapped_type?: MappingFieldType - numeric_type?: SearchFieldSortNumericType - format?: string -} - -export type SearchFieldSortNumericType = 'long' | 'double' | 'date' | 'date_nanos' - export interface SearchFieldSuggester { completion?: SearchCompletionSuggester phrase?: SearchPhraseSuggester @@ -1174,16 +1146,6 @@ export interface SearchFieldSuggester { text?: string } -export interface SearchGeoDistanceSortKeys { - mode?: SearchSortMode - distance_type?: GeoDistanceType - ignore_unmapped?: boolean - order?: SearchSortOrder - unit?: DistanceUnit -} -export type SearchGeoDistanceSort = SearchGeoDistanceSortKeys -& { [property: string]: GeoLocation | GeoLocation[] | SearchSortMode | GeoDistanceType | boolean | SearchSortOrder | DistanceUnit } - export interface SearchHighlight { fields: Record type?: SearchHighlighterType @@ -1244,8 +1206,7 @@ export type SearchHighlighterType = SearchBuiltinHighlighterType | string export interface SearchHit { _index: IndexName _id: Id - _score?: double - _type?: Type + _score?: double | null _explanation?: ExplainExplanation fields?: Record highlight?: Record @@ -1260,13 +1221,13 @@ export interface SearchHit { _seq_no?: SequenceNumber _primary_term?: long _version?: VersionNumber - sort?: SearchSortResults + sort?: SortResults } export interface SearchHitsMetadata { - total: SearchTotalHits | long + total?: SearchTotalHits | long hits: SearchHit[] - max_score?: double + max_score?: double | null } export interface SearchInnerHits { @@ -1281,7 +1242,7 @@ export interface SearchInnerHits { script_fields?: Record seq_no_primary_term?: boolean fields?: Fields - sort?: SearchSort + sort?: Sort _source?: SearchSourceConfig stored_field?: Fields track_scores?: boolean @@ -1308,13 +1269,6 @@ export interface SearchNestedIdentity { _nested?: SearchNestedIdentity } -export interface SearchNestedSortValue { - filter?: QueryDslQueryContainer - max_children?: integer - nested?: SearchNestedSortValue - path: Field -} - export interface SearchPhraseSuggestCollate { params?: Record prune?: boolean @@ -1405,20 +1359,6 @@ export interface SearchRescoreQuery { export type SearchScoreMode = 'avg' | 'max' | 'min' | 'multiply' | 'total' -export interface SearchScoreSort { - order?: SearchSortOrder -} - -export interface SearchScriptSort { - order?: SearchSortOrder - script: Script - type?: SearchScriptSortType - mode?: SearchSortMode - nested?: SearchNestedSortValue -} - -export type SearchScriptSortType = 'string' | 'number' - export interface SearchSearchProfile { collector: SearchCollector[] query: SearchQueryProfile[] @@ -1438,25 +1378,6 @@ export interface SearchSmoothingModelContainer { stupid_backoff?: SearchStupidBackoffSmoothingModel } -export type SearchSort = SearchSortCombinations | SearchSortCombinations[] - -export type SearchSortCombinations = Field | SearchSortOptions - -export type SearchSortMode = 'min' | 'max' | 'sum' | 'avg' | 'median' - -export interface SearchSortOptionsKeys { - _score?: SearchScoreSort - _doc?: SearchScoreSort - _geo_distance?: SearchGeoDistanceSort - _script?: SearchScriptSort -} -export type SearchSortOptions = SearchSortOptionsKeys -& { [property: string]: SearchFieldSort | SearchSortOrder | SearchScoreSort | SearchGeoDistanceSort | SearchScriptSort } - -export type SearchSortOrder = 'asc' | 'desc' - -export type SearchSortResults = (long | double | string | null)[] - export type SearchSourceConfig = boolean | SearchSourceFilter | Fields export type SearchSourceConfigParam = boolean | Fields @@ -1550,7 +1471,7 @@ export interface SearchMvtRequest extends RequestBase { fields?: Fields query?: QueryDslQueryContainer runtime_mappings?: MappingRuntimeFields - sort?: SearchSort + sort?: Sort } export type SearchMvtResponse = MapboxVectorTiles @@ -1667,7 +1588,6 @@ export interface TermvectorsResponse { _index: IndexName term_vectors?: Record took: long - _type?: Type _version: VersionNumber } @@ -1694,7 +1614,6 @@ export interface TermvectorsToken { export interface UpdateRequest extends RequestBase { id: Id index: IndexName - type?: Type if_primary_term?: long if_seq_no?: SequenceNumber lang?: string @@ -1731,6 +1650,7 @@ export interface UpdateByQueryRequest extends RequestBase { from?: long ignore_unavailable?: boolean lenient?: boolean + max_docs?: long pipeline?: string preference?: string refresh?: boolean @@ -1741,12 +1661,8 @@ export interface UpdateByQueryRequest extends RequestBase { scroll_size?: long search_timeout?: Time search_type?: SearchType - size?: long slices?: long sort?: string[] - _source?: SearchSourceConfigParam - _source_excludes?: Fields - _source_includes?: Fields stats?: string[] terminate_after?: long timeout?: Time @@ -1754,7 +1670,6 @@ export interface UpdateByQueryRequest extends RequestBase { version_type?: boolean wait_for_active_shards?: WaitForActiveShards wait_for_completion?: boolean - max_docs?: long query?: QueryDslQueryContainer script?: Script slice?: SlicedScroll @@ -1880,7 +1795,7 @@ export type DistanceUnit = 'in' | 'ft' | 'yd' | 'mi' | 'nmi' | 'km' | 'm' | 'cm' export interface DocStats { count: long - deleted: long + deleted?: long } export interface ElasticsearchVersionInfo { @@ -1932,6 +1847,18 @@ export interface FieldSizeUsage { size_in_bytes: long } +export interface FieldSort { + missing?: AggregationsMissing + mode?: SortMode + nested?: NestedSortValue + order?: SortOrder + unmapped_type?: MappingFieldType + numeric_type?: FieldSortNumericType + format?: string +} + +export type FieldSortNumericType = 'long' | 'double' | 'date' | 'date_nanos' + export type FieldValue = long | double | string | boolean export interface FielddataStats { @@ -1954,6 +1881,16 @@ export type Fuzziness = string | integer export type GeoBounds = CoordsGeoBounds | TopLeftBottomRightGeoBounds | TopRightBottomLeftGeoBounds | WktGeoBounds +export interface GeoDistanceSortKeys { + mode?: SortMode + distance_type?: GeoDistanceType + ignore_unmapped?: boolean + order?: SortOrder + unit?: DistanceUnit +} +export type GeoDistanceSort = GeoDistanceSortKeys +& { [property: string]: GeoLocation | GeoLocation[] | SortMode | GeoDistanceType | boolean | SortOrder | DistanceUnit } + export type GeoDistanceType = 'arc' | 'plane' export type GeoHash = string @@ -2029,6 +1966,13 @@ export interface IndexingStats { export type Indices = IndexName | IndexName[] +export interface IndicesOptions { + allow_no_indices?: boolean + expand_wildcards?: ExpandWildcards + ignore_unavailable?: boolean + ignore_throttled?: boolean +} + export interface IndicesResponseBase extends AcknowledgedResponseBase { _shards?: ShardStatistics } @@ -2096,6 +2040,13 @@ export type Names = Name | Name[] export type Namespace = string +export interface NestedSortValue { + filter?: QueryDslQueryContainer + max_children?: integer + nested?: NestedSortValue + path: Field +} + export interface NodeAttributes { attributes: Record ephemeral_id: Id @@ -2198,7 +2149,7 @@ export interface RequestCacheStats { miss_count: long } -export type Result = 'Error' | 'created' | 'updated' | 'deleted' | 'not_found' | 'noop' +export type Result = 'created' | 'updated' | 'deleted' | 'not_found' | 'noop' export interface Retries { bulk: long @@ -2207,6 +2158,10 @@ export interface Retries { export type Routing = string +export interface ScoreSort { + order?: SortOrder +} + export type Script = InlineScript | string | StoredScriptId export interface ScriptBase { @@ -2220,6 +2175,16 @@ export interface ScriptField { export type ScriptLanguage = BuiltinScriptLanguage | string +export interface ScriptSort { + order?: SortOrder + script: Script + type?: ScriptSortType + mode?: SortMode + nested?: NestedSortValue +} + +export type ScriptSortType = 'string' | 'number' + export interface ScriptTransform { lang: string params: Record @@ -2308,6 +2273,25 @@ export interface SlicedScroll { max: integer } +export type Sort = SortCombinations | SortCombinations[] + +export type SortCombinations = Field | SortOptions + +export type SortMode = 'min' | 'max' | 'sum' | 'avg' | 'median' + +export interface SortOptionsKeys { + _score?: ScoreSort + _doc?: ScoreSort + _geo_distance?: GeoDistanceSort + _script?: ScriptSort +} +export type SortOptions = SortOptionsKeys +& { [property: string]: FieldSort | SortOrder | ScoreSort | GeoDistanceSort | ScriptSort } + +export type SortOrder = 'asc' | 'desc' + +export type SortResults = (long | double | string | null)[] + export interface StoreStats { size?: ByteSize size_in_bytes: integer @@ -2376,10 +2360,6 @@ export interface TranslogStats { export type TransportAddress = string -export type Type = string - -export type Types = Type | Type[] - export type Username = string export type Uuid = string @@ -2414,7 +2394,6 @@ export interface WriteResponseBase { result: Result _seq_no: SequenceNumber _shards: ShardStatistics - _type?: Type _version: VersionNumber forced_refresh?: boolean } @@ -2611,7 +2590,7 @@ export interface AggregationsBucketSortAggregation extends AggregationsAggregati from?: integer gap_policy?: AggregationsGapPolicy size?: integer - sort?: SearchSort + sort?: Sort } export type AggregationsBuckets = Record | TBucket[] @@ -2885,7 +2864,7 @@ export interface AggregationsGeoLineAggregation { point: AggregationsGeoLinePoint sort: AggregationsGeoLineSort include_sort?: boolean - sort_order?: SearchSortOrder + sort_order?: SortOrder size?: integer } @@ -2959,8 +2938,8 @@ export type AggregationsHistogramBucket = AggregationsHistogramBucketKeys & { [property: string]: AggregationsAggregate | string | double | long } export interface AggregationsHistogramOrder { - _count?: SearchSortOrder - _key?: SearchSortOrder + _count?: SortOrder + _key?: SortOrder } export interface AggregationsHoltLinearModelSettings { @@ -3067,11 +3046,11 @@ export interface AggregationsLongTermsAggregate extends AggregationsTermsAggrega } export interface AggregationsLongTermsBucketKeys extends AggregationsTermsBucketBase { - key: string + key: long key_as_string?: string } export type AggregationsLongTermsBucket = AggregationsLongTermsBucketKeys -& { [property: string]: AggregationsAggregate | string | long } +& { [property: string]: AggregationsAggregate | long | string } export interface AggregationsMatrixAggregation extends AggregationsAggregation { fields?: Fields @@ -3084,7 +3063,7 @@ export interface AggregationsMatrixStatsAggregate extends AggregationsAggregateB } export interface AggregationsMatrixStatsAggregation extends AggregationsMatrixAggregation { - mode?: AggregationsMatrixStatsMode + mode?: SortMode } export interface AggregationsMatrixStatsFields { @@ -3098,8 +3077,6 @@ export interface AggregationsMatrixStatsFields { correlation: Record } -export type AggregationsMatrixStatsMode = 'avg' | 'min' | 'max' | 'sum' | 'median' - export interface AggregationsMaxAggregate extends AggregationsSingleMetricAggregateBase { } @@ -3542,7 +3519,7 @@ export type AggregationsTermsAggregationCollectMode = 'depth_first' | 'breadth_f export type AggregationsTermsAggregationExecutionHint = 'map' | 'global_ordinals' | 'global_ordinals_hash' | 'global_ordinals_low_cardinality' -export type AggregationsTermsAggregationOrder = Record | Record[] +export type AggregationsTermsAggregationOrder = Record | Record[] export interface AggregationsTermsBucketBase extends AggregationsMultiBucketBase { doc_count_error?: long @@ -3574,7 +3551,7 @@ export interface AggregationsTopHitsAggregation extends AggregationsMetricAggreg highlight?: SearchHighlight script_fields?: Record size?: integer - sort?: SearchSort + sort?: Sort _source?: SearchSourceConfig stored_fields?: Fields track_scores?: boolean @@ -3593,7 +3570,7 @@ export interface AggregationsTopMetricsAggregate extends AggregationsMultiBucket export interface AggregationsTopMetricsAggregation extends AggregationsMetricAggregationBase { metrics?: AggregationsTopMetricsValue | AggregationsTopMetricsValue[] size?: integer - sort?: SearchSort + sort?: Sort } export interface AggregationsTopMetricsBucketKeys extends AggregationsMultiBucketBase { @@ -5051,7 +5028,6 @@ export interface QueryDslLikeDocument { doc?: any fields?: Field[] _id?: Id - _type?: Type _index?: IndexName per_field_analyzer?: Record routing?: Routing @@ -5157,11 +5133,9 @@ export interface QueryDslNestedQuery extends QueryDslQueryBase { inner_hits?: SearchInnerHits path: Field query: QueryDslQueryContainer - score_mode?: QueryDslNestedScoreMode + score_mode?: QueryDslChildScoreMode } -export type QueryDslNestedScoreMode = 'avg' | 'sum' | 'min' | 'max' | 'none' - export interface QueryDslNumberRangeQuery extends QueryDslRangeQueryBase { gt?: double gte?: double @@ -5271,6 +5245,7 @@ export interface QueryDslQueryContainer { terms?: QueryDslTermsQuery terms_set?: Partial> wildcard?: Partial> + wrapper?: QueryDslWrapperQuery type?: QueryDslTypeQuery } @@ -5500,10 +5475,14 @@ export interface QueryDslWildcardQuery extends QueryDslQueryBase { wildcard?: string } +export interface QueryDslWrapperQuery extends QueryDslQueryBase { + query: string +} + export type QueryDslZeroTermsQuery = 'all' | 'none' -export interface AsyncSearchAsyncSearch { - aggregations?: Record +export interface AsyncSearchAsyncSearch> { + aggregations?: TAggregations _clusters?: ClusterStatistics fields?: Record hits: SearchHitsMetadata @@ -5519,8 +5498,8 @@ export interface AsyncSearchAsyncSearch { took: long } -export interface AsyncSearchAsyncSearchDocumentResponseBase extends AsyncSearchAsyncSearchResponseBase { - response: AsyncSearchAsyncSearch +export interface AsyncSearchAsyncSearchDocumentResponseBase> extends AsyncSearchAsyncSearchResponseBase { + response: AsyncSearchAsyncSearch } export interface AsyncSearchAsyncSearchResponseBase { @@ -5616,7 +5595,7 @@ export interface AsyncSearchSubmitRequest extends RequestBase { query?: QueryDslQueryContainer rescore?: SearchRescore | SearchRescore[] script_fields?: Record - search_after?: SearchSortResults + search_after?: SortResults slice?: SlicedScroll fields?: (QueryDslFieldAndFormat | Field)[] suggest?: SearchSuggester @@ -6169,8 +6148,8 @@ export type CatMasterResponse = CatMasterMasterRecord[] export interface CatMlDataFrameAnalyticsDataFrameAnalyticsRecord { id?: Id - type?: Type - t?: Type + type?: string + t?: string create_time?: string ct?: string createTime?: string @@ -6540,8 +6519,8 @@ export interface CatNodesNodesRecord { v?: VersionString flavor?: string f?: string - type?: Type - t?: Type + type?: string + t?: string build?: string b?: string jdk?: string @@ -6828,8 +6807,8 @@ export interface CatPluginsPluginsRecord { v?: VersionString description?: string d?: string - type?: Type - t?: Type + type?: string + t?: string } export interface CatPluginsRequest extends CatCatRequestBase { @@ -6855,8 +6834,8 @@ export interface CatRecoveryRecoveryRecord { time?: string t?: string ti?: string - type?: Type - ty?: Type + type?: string + ty?: string stage?: string st?: string source_host?: string @@ -7244,8 +7223,8 @@ export interface CatTasksTasksRecord { ti?: Id parent_task_id?: string pti?: string - type?: Type - ty?: Type + type?: string + ty?: string start_time?: string start?: string timestamp?: string @@ -7293,7 +7272,7 @@ export interface CatTemplatesTemplatesRecord { export interface CatThreadPoolRequest extends CatCatRequestBase { thread_pool_patterns?: Names - size?: CatThreadPoolThreadPoolSize + time?: Time } export type CatThreadPoolResponse = CatThreadPoolThreadPoolRecord[] @@ -7341,8 +7320,6 @@ export interface CatThreadPoolThreadPoolRecord { ka?: string } -export type CatThreadPoolThreadPoolSize = 'k' | 'm' | 'g' | 't' | 'p' - export interface CatTransformsRequest extends CatCatRequestBase { transform_id?: Id allow_no_match?: boolean @@ -8783,7 +8760,7 @@ export interface IndicesIndexRoutingAllocation { } export interface IndicesIndexRoutingAllocationDisk { - threshold_enabled: boolean | string + threshold_enabled?: boolean | string } export interface IndicesIndexRoutingAllocationInclude { @@ -8806,8 +8783,8 @@ export type IndicesIndexRoutingRebalanceOptions = 'all' | 'primaries' | 'replica export interface IndicesIndexSegmentSort { field: Fields order: IndicesSegmentSortOrder | IndicesSegmentSortOrder[] - mode?: IndicesSegmentSortMode - missing?: IndicesSegmentSortMissing + mode?: IndicesSegmentSortMode | IndicesSegmentSortMode[] + missing?: IndicesSegmentSortMissing | IndicesSegmentSortMissing[] } export interface IndicesIndexSettingBlocks { @@ -8946,6 +8923,7 @@ export interface IndicesIndexState { aliases?: Record mappings?: MappingTypeMapping settings?: IndicesIndexSettings + defaults?: IndicesIndexSettings data_stream?: DataStreamName } @@ -9125,7 +9103,6 @@ export interface IndicesCloseResponse extends AcknowledgedResponseBase { export interface IndicesCreateRequest extends RequestBase { index: IndexName - include_type_name?: boolean master_timeout?: Time timeout?: Time wait_for_active_shards?: WaitForActiveShards @@ -9268,17 +9245,6 @@ export interface IndicesExistsTemplateRequest extends RequestBase { export type IndicesExistsTemplateResponse = boolean -export interface IndicesExistsTypeRequest extends RequestBase { - index: Indices - type: Types - allow_no_indices?: boolean - expand_wildcards?: ExpandWildcards - ignore_unavailable?: boolean - local?: boolean -} - -export type IndicesExistsTypeResponse = boolean - export interface IndicesFlushRequest extends RequestBase { index?: Indices allow_no_indices?: boolean @@ -9311,7 +9277,6 @@ export interface IndicesGetRequest extends RequestBase { flat_settings?: boolean ignore_unavailable?: boolean include_defaults?: boolean - include_type_name?: boolean local?: boolean master_timeout?: Time } @@ -9373,7 +9338,6 @@ export interface IndicesGetFieldMappingRequest extends RequestBase { expand_wildcards?: ExpandWildcards ignore_unavailable?: boolean include_defaults?: boolean - include_type_name?: boolean local?: boolean } @@ -9410,7 +9374,6 @@ export interface IndicesGetIndexTemplateRequest extends RequestBase { name?: Name local?: boolean flat_settings?: boolean - include_type_name?: boolean master_timeout?: Time } @@ -9428,7 +9391,6 @@ export interface IndicesGetMappingRequest extends RequestBase { allow_no_indices?: boolean expand_wildcards?: ExpandWildcards ignore_unavailable?: boolean - include_type_name?: boolean local?: boolean master_timeout?: Time } @@ -9454,7 +9416,6 @@ export interface IndicesGetSettingsResponse extends DictionaryResponseBase - export interface IndicesRolloverRequest extends RequestBase { alias: IndexAlias new_index?: IndexName dry_run?: boolean - include_type_name?: boolean master_timeout?: Time timeout?: Time wait_for_active_shards?: WaitForActiveShards aliases?: Record conditions?: IndicesRolloverRolloverConditions - mappings?: IndicesRolloverIndexRolloverMapping + mappings?: MappingTypeMapping settings?: Record } @@ -9937,6 +9893,7 @@ export interface IndicesStatsIndexStats { flush?: FlushStats get?: GetStats indexing?: IndexingStats + indices?: IndicesStatsIndicesStats merges?: MergesStats query_cache?: QueryCacheStats recovery?: RecoveryStats @@ -9948,13 +9905,13 @@ export interface IndicesStatsIndexStats { translog?: TranslogStats warmer?: WarmerStats bulk?: BulkStats - shards?: IndicesStatsShardsTotalStats + shard_stats?: IndicesStatsShardsTotalStats } export interface IndicesStatsIndicesStats { - primaries: IndicesStatsIndexStats + primaries?: IndicesStatsIndexStats shards?: Record - total: IndicesStatsIndexStats + total?: IndicesStatsIndexStats uuid?: Uuid } @@ -9970,7 +9927,6 @@ export interface IndicesStatsRequest extends RequestBase { include_segment_file_sizes?: boolean include_unloaded_segments?: boolean level?: Level - types?: Types } export interface IndicesStatsResponse { @@ -10040,29 +9996,31 @@ export interface IndicesStatsShardSequenceNumber { } export interface IndicesStatsShardStats { - commit: IndicesStatsShardCommit - completion: CompletionStats - docs: DocStats - fielddata: FielddataStats - flush: FlushStats - get: GetStats - indexing: IndexingStats - merges: MergesStats - shard_path: IndicesStatsShardPath - query_cache: IndicesStatsShardQueryCache - recovery: RecoveryStats - refresh: RefreshStats - request_cache: RequestCacheStats - retention_leases: IndicesStatsShardRetentionLeases - routing: IndicesStatsShardRouting - search: SearchStats - segments: SegmentsStats - seq_no: IndicesStatsShardSequenceNumber - store: StoreStats - translog: TranslogStats - warmer: WarmerStats + commit?: IndicesStatsShardCommit + completion?: CompletionStats + docs?: DocStats + fielddata?: FielddataStats + flush?: FlushStats + get?: GetStats + indexing?: IndexingStats + merges?: MergesStats + shard_path?: IndicesStatsShardPath + query_cache?: IndicesStatsShardQueryCache + recovery?: RecoveryStats + refresh?: RefreshStats + request_cache?: RequestCacheStats + retention_leases?: IndicesStatsShardRetentionLeases + routing?: IndicesStatsShardRouting + search?: SearchStats + segments?: SegmentsStats + seq_no?: IndicesStatsShardSequenceNumber + store?: StoreStats + translog?: TranslogStats + warmer?: WarmerStats bulk?: BulkStats - shards: IndicesStatsShardsTotalStats + shards?: IndicesStatsShardsTotalStats + shard_stats?: IndicesStatsShardsTotalStats + indices?: IndicesStatsIndicesStats } export interface IndicesStatsShardsTotalStats { @@ -10133,7 +10091,6 @@ export interface IndicesValidateQueryIndicesValidationExplanation { export interface IndicesValidateQueryRequest extends RequestBase { index?: Indices - type?: Types allow_no_indices?: boolean all_shards?: boolean analyzer?: string @@ -10418,7 +10375,7 @@ export type IngestShapeType = 'geo_shape' | 'shape' export interface IngestSortProcessor extends IngestProcessorBase { field: Field - order: SearchSortOrder + order: SortOrder target_field: Field } @@ -10535,7 +10492,6 @@ export interface IngestSimulateDocumentSimulation { _parent?: string _routing?: string _source: Record - _type?: Type } export interface IngestSimulateIngest { @@ -10921,7 +10877,7 @@ export interface MlDatafeed { scroll_size?: integer delayed_data_check_config: MlDelayedDataCheckConfig runtime_mappings?: MappingRuntimeFields - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions } export interface MlDatafeedConfig { @@ -10933,7 +10889,7 @@ export interface MlDatafeedConfig { frequency?: Timestamp indexes?: string[] indices: string[] - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions job_id?: Id max_empty_searches?: integer query: QueryDslQueryContainer @@ -10943,13 +10899,6 @@ export interface MlDatafeedConfig { scroll_size?: integer } -export interface MlDatafeedIndicesOptions { - allow_no_indices?: boolean - expand_wildcards?: ExpandWildcards - ignore_unavailable?: boolean - ignore_throttled?: boolean -} - export type MlDatafeedState = 'started' | 'stopped' | 'starting' | 'stopping' export interface MlDatafeedStats { @@ -11216,6 +11165,8 @@ export interface MlDelayedDataCheckConfig { enabled: boolean } +export type MlDeploymentState = 'started' | 'starting' | 'fully_allocated' + export interface MlDetectionRule { actions?: MlRuleAction[] conditions?: MlRuleCondition[] @@ -11477,6 +11428,10 @@ export interface MlPerPartitionCategorization { stop_on_warn?: boolean } +export type MlPredictedValue = string | double + +export type MlRoutingState = 'failed' | 'started' | 'starting' | 'stopped' | 'stopping' + export type MlRuleAction = 'skip_result' | 'skip_model_update' export interface MlRuleCondition { @@ -11490,6 +11445,12 @@ export interface MlTimingStats { iteration_time?: integer } +export interface MlTopClassEntry { + class_name: string + class_probability: double + class_score: double +} + export interface MlTotalFeatureImportance { feature_name: Name importance: MlTotalFeatureImportanceStatistics[] @@ -11507,6 +11468,23 @@ export interface MlTotalFeatureImportanceStatistics { min: integer } +export interface MlTrainedModelAllocation { + allocation_state: MlDeploymentState + routing_table: Record + start_time: DateString + task_parameters: MlTrainedModelAllocationTaskParameters +} + +export interface MlTrainedModelAllocationRoutingTable { + reason: string + routing_state: MlRoutingState +} + +export interface MlTrainedModelAllocationTaskParameters { + model_bytes: integer + model_id: Id +} + export interface MlTrainedModelConfig { model_id: Id model_type: MlTrainedModelType @@ -11536,6 +11514,14 @@ export interface MlTrainedModelConfigMetadata { total_feature_importance?: MlTotalFeatureImportance[] } +export interface MlTrainedModelEntities { + class_name: string + class_probability: double + entity: string + start_pos: integer + end_pos: integer +} + export interface MlTrainedModelInferenceStats { failure_count: long inference_count: long @@ -11870,8 +11856,8 @@ export interface MlGetCategoriesRequest extends RequestBase { job_id: Id category_id?: CategoryId from?: integer - size?: integer partition_field_value?: string + size?: integer page?: MlPage } @@ -12056,6 +12042,22 @@ export interface MlGetTrainedModelsStatsResponse { trained_model_stats: MlTrainedModelStats[] } +export interface MlInferTrainedModelDeploymentRequest extends RequestBase { + model_id: Id + timeout?: Time + docs: Record[] +} + +export interface MlInferTrainedModelDeploymentResponse { + entities?: MlTrainedModelEntities[] + is_truncated?: boolean + predicted_value?: MlPredictedValue[] + predicted_value_sequence?: string + prediction_probability?: double + top_classes: MlTopClassEntry[] + warning?: string +} + export interface MlInfoAnomalyDetectors { categorization_analyzer: MlCategorizationAnalyzer categorization_examples_limit: integer @@ -12225,7 +12227,7 @@ export interface MlPutDatafeedRequest extends RequestBase { frequency?: Time indices?: string[] indexes?: string[] - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions job_id?: Id max_empty_searches?: integer query?: QueryDslQueryContainer @@ -12243,7 +12245,7 @@ export interface MlPutDatafeedResponse { frequency: Time indices: string[] job_id: Id - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions max_empty_searches: integer query: QueryDslQueryContainer query_delay: Time @@ -12406,6 +12408,25 @@ export interface MlPutTrainedModelAliasRequest extends RequestBase { export interface MlPutTrainedModelAliasResponse extends AcknowledgedResponseBase { } +export interface MlPutTrainedModelDefinitionPartRequest extends RequestBase { + model_id: Id + part: integer + definition: string + total_definition_length: long + total_parts: integer +} + +export interface MlPutTrainedModelDefinitionPartResponse extends AcknowledgedResponseBase { +} + +export interface MlPutTrainedModelVocabularyRequest extends RequestBase { + model_id: Id + vocabulary: string[] +} + +export interface MlPutTrainedModelVocabularyResponse extends AcknowledgedResponseBase { +} + export interface MlResetJobRequest extends RequestBase { job_id: Id wait_for_completion?: boolean @@ -12453,6 +12474,19 @@ export interface MlStartDatafeedResponse { started: boolean } +export interface MlStartTrainedModelDeploymentRequest extends RequestBase { + model_id: Id + inference_threads?: integer + model_threads?: integer + queue_capacity?: integer + timeout?: Time + wait_for?: MlDeploymentState +} + +export interface MlStartTrainedModelDeploymentResponse { + allocation: MlTrainedModelAllocation +} + export interface MlStopDataFrameAnalyticsRequest extends RequestBase { id: Id allow_no_match?: boolean @@ -12475,6 +12509,16 @@ export interface MlStopDatafeedResponse { stopped: boolean } +export interface MlStopTrainedModelDeploymentRequest extends RequestBase { + model_id: Id + allow_no_match?: boolean + force?: boolean +} + +export interface MlStopTrainedModelDeploymentResponse { + stopped: boolean +} + export interface MlUpdateDataFrameAnalyticsRequest extends RequestBase { id: Id description?: string @@ -12509,7 +12553,7 @@ export interface MlUpdateDatafeedRequest extends RequestBase { frequency?: Time indices?: string[] indexes?: string[] - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions max_empty_searches?: integer query?: QueryDslQueryContainer query_delay?: Time @@ -12526,7 +12570,7 @@ export interface MlUpdateDatafeedResponse { frequency: Time indices: string[] job_id: Id - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions max_empty_searches: integer query: QueryDslQueryContainer query_delay: Time @@ -12650,26 +12694,100 @@ export interface MonitoringBulkResponse { } export interface NodesAdaptiveSelection { - avg_queue_size: long - avg_response_time: long - avg_response_time_ns: long - avg_service_time: string - avg_service_time_ns: long - outgoing_searches: long - rank: string + avg_queue_size?: long + avg_response_time?: long + avg_response_time_ns?: long + avg_service_time?: string + avg_service_time_ns?: long + outgoing_searches?: long + rank?: string } export interface NodesBreaker { - estimated_size: string - estimated_size_in_bytes: long - limit_size: string - limit_size_in_bytes: long - overhead: float - tripped: float + estimated_size?: string + estimated_size_in_bytes?: long + limit_size?: string + limit_size_in_bytes?: long + overhead?: float + tripped?: float +} + +export interface NodesCgroup { + cpuacct?: NodesCpuAcct + cpu?: NodesCgroupCpu + memory?: NodesCgroupMemory +} + +export interface NodesCgroupCpu { + control_group?: string + cfs_period_micros?: integer + cfs_quota_micros?: integer + stat?: NodesCgroupCpuStat +} + +export interface NodesCgroupCpuStat { + number_of_elapsed_periods?: long + number_of_times_throttled?: long + time_throttled_nanos?: long +} + +export interface NodesCgroupMemory { + control_group?: string + limit_in_bytes?: string + usage_in_bytes?: string +} + +export interface NodesClient { + id?: long + agent?: string + local_address?: string + remote_address?: string + last_uri?: string + opened_time_millis?: long + closed_time_millis?: long + last_request_time_millis?: long + request_count?: long + request_size_bytes?: long + x_opaque_id?: string +} + +export interface NodesClusterAppliedStats { + recordings?: NodesRecording[] +} + +export interface NodesClusterStateQueue { + total?: long + pending?: long + committed?: long +} + +export interface NodesClusterStateUpdate { + count?: long + computation_time?: string + computation_time_millis?: long + publication_time?: string + publication_time_millis?: long + context_construction_time?: string + context_construction_time_millis?: long + commit_time?: string + commit_time_millis?: long + completion_time?: string + completion_time_millis?: long + master_apply_time?: string + master_apply_time_millis?: long + notification_time?: string + notification_time_millis?: long +} + +export interface NodesContext { + context?: string + compilations?: long + cache_evictions?: long + compilation_limit_triggered?: long } export interface NodesCpu { - percent: integer + percent?: integer sys?: string sys_in_millis?: long total?: string @@ -12679,182 +12797,306 @@ export interface NodesCpu { load_average?: Record } +export interface NodesCpuAcct { + control_group?: string + usage_nanos?: long +} + export interface NodesDataPathStats { - available: string - available_in_bytes: long - disk_queue: string - disk_reads: long - disk_read_size: string - disk_read_size_in_bytes: long - disk_writes: long - disk_write_size: string - disk_write_size_in_bytes: long - free: string - free_in_bytes: long - mount: string - path: string - total: string - total_in_bytes: long - type: string + available?: string + available_in_bytes?: long + disk_queue?: string + disk_reads?: long + disk_read_size?: string + disk_read_size_in_bytes?: long + disk_writes?: long + disk_write_size?: string + disk_write_size_in_bytes?: long + free?: string + free_in_bytes?: long + mount?: string + path?: string + total?: string + total_in_bytes?: long + type?: string +} + +export interface NodesDiscovery { + cluster_state_queue?: NodesClusterStateQueue + published_cluster_states?: NodesPublishedClusterStates + cluster_state_update?: Record + serialized_cluster_states?: NodesSerializedClusterState + cluster_applier_stats?: NodesClusterAppliedStats } export interface NodesExtendedMemoryStats extends NodesMemoryStats { - free_percent: integer - used_percent: integer + free_percent?: integer + used_percent?: integer } export interface NodesFileSystem { - data: NodesDataPathStats[] - timestamp: long - total: NodesFileSystemTotal + data?: NodesDataPathStats[] + timestamp?: long + total?: NodesFileSystemTotal + io_stats?: NodesIoStats } export interface NodesFileSystemTotal { - available: string - available_in_bytes: long - free: string - free_in_bytes: long - total: string - total_in_bytes: long + available?: string + available_in_bytes?: long + free?: string + free_in_bytes?: long + total?: string + total_in_bytes?: long } export interface NodesGarbageCollector { - collectors: Record + collectors?: Record } export interface NodesGarbageCollectorTotal { - collection_count: long - collection_time: string - collection_time_in_millis: long + collection_count?: long + collection_time?: string + collection_time_in_millis?: long } export interface NodesHttp { - current_open: integer - total_opened: long + current_open?: integer + total_opened?: long + clients?: NodesClient[] +} + +export interface NodesIndexingPressure { + memory?: NodesIndexingPressureMemory +} + +export interface NodesIndexingPressureMemory { + limit_in_bytes?: long + current?: NodesPressureMemory + total?: NodesPressureMemory } export interface NodesIngest { - pipelines: Record - total: NodesIngestTotal + pipelines?: Record + total?: NodesIngestTotal } export interface NodesIngestTotal { - count: long - current: long - failed: long - processors: NodesKeyedProcessor[] - time_in_millis: long + count?: long + current?: long + failed?: long + processors?: Record[] + time_in_millis?: long +} + +export interface NodesIoStatDevice { + device_name?: string + operations?: long + read_kilobytes?: long + read_operations?: long + write_kilobytes?: long + write_operations?: long +} + +export interface NodesIoStats { + devices?: NodesIoStatDevice[] + total?: NodesIoStatDevice } export interface NodesJvm { - buffer_pools: Record - classes: NodesJvmClasses - gc: NodesGarbageCollector - mem: NodesMemoryStats - threads: NodesJvmThreads - timestamp: long - uptime: string - uptime_in_millis: long + buffer_pools?: Record + classes?: NodesJvmClasses + gc?: NodesGarbageCollector + mem?: NodesJvmMemoryStats + threads?: NodesJvmThreads + timestamp?: long + uptime?: string + uptime_in_millis?: long } export interface NodesJvmClasses { - current_loaded_count: long - total_loaded_count: long - total_unloaded_count: long + current_loaded_count?: long + total_loaded_count?: long + total_unloaded_count?: long +} + +export interface NodesJvmMemoryStats { + heap_used_in_bytes?: long + heap_used_percent?: long + heap_committed_in_bytes?: long + heap_max_in_bytes?: long + non_heap_used_in_bytes?: long + non_heap_committed_in_bytes?: long + pools?: Record } export interface NodesJvmThreads { - count: long - peak_count: long + count?: long + peak_count?: long } export interface NodesKeyedProcessor { - statistics: NodesProcess - type: string + stats?: NodesProcessor + type?: string } export interface NodesMemoryStats { + adjusted_total_in_bytes?: long resident?: string resident_in_bytes?: long share?: string share_in_bytes?: long total_virtual?: string total_virtual_in_bytes?: long - total_in_bytes: long - free_in_bytes: long - used_in_bytes: long + total_in_bytes?: long + free_in_bytes?: long + used_in_bytes?: long } export interface NodesNodeBufferPool { - count: long - total_capacity: string - total_capacity_in_bytes: long - used: string - used_in_bytes: long + count?: long + total_capacity?: string + total_capacity_in_bytes?: long + used?: string + used_in_bytes?: long } export interface NodesNodesResponseBase { - _nodes: NodeStatistics + _nodes?: NodeStatistics } export interface NodesOperatingSystem { - cpu: NodesCpu - mem: NodesExtendedMemoryStats - swap: NodesMemoryStats - timestamp: long + cpu?: NodesCpu + mem?: NodesExtendedMemoryStats + swap?: NodesMemoryStats + cgroup?: NodesCgroup + timestamp?: long +} + +export interface NodesPool { + used_in_bytes?: long + max_in_bytes?: long + peak_used_in_bytes?: long + peak_max_in_bytes?: long +} + +export interface NodesPressureMemory { + combined_coordinating_and_primary_in_bytes?: long + coordinating_in_bytes?: long + primary_in_bytes?: long + replica_in_bytes?: long + all_in_bytes?: long + coordinating_rejections?: long + primary_rejections?: long + replica_rejections?: long } export interface NodesProcess { - cpu: NodesCpu - mem: NodesMemoryStats - open_file_descriptors: integer - timestamp: long + cpu?: NodesCpu + mem?: NodesMemoryStats + open_file_descriptors?: integer + max_file_descriptors?: integer + timestamp?: long +} + +export interface NodesProcessor { + count?: long + current?: long + failed?: long + time_in_millis?: long +} + +export interface NodesPublishedClusterStates { + full_states?: long + incompatible_diffs?: long + compatible_diffs?: long +} + +export interface NodesRecording { + name?: string + cumulative_execution_count?: long + cumulative_execution_time?: string + cumulative_execution_time_millis?: long +} + +export interface NodesScriptCache { + cache_evictions?: long + compilation_limit_triggered?: long + compilations?: long + context?: string } export interface NodesScripting { - cache_evictions: long - compilations: long + cache_evictions?: long + compilations?: long + compilation_limit_triggered?: long + contexts?: NodesContext[] +} + +export interface NodesSerializedClusterState { + full_states?: NodesSerializedClusterStateDetail + diffs?: NodesSerializedClusterStateDetail +} + +export interface NodesSerializedClusterStateDetail { + count?: long + uncompressed_size?: string + uncompressed_size_in_bytes?: long + compressed_size?: string + compressed_size_in_bytes?: long } export interface NodesStats { - adaptive_selection: Record - breakers: Record - fs: NodesFileSystem - host: Host - http: NodesHttp - indices: IndicesStatsIndexStats - ingest: NodesIngest - ip: Ip | Ip[] - jvm: NodesJvm - name: Name - os: NodesOperatingSystem - process: NodesProcess - roles: NodeRoles - script: NodesScripting - thread_pool: Record - timestamp: long - transport: NodesTransport - transport_address: TransportAddress - attributes: Record + adaptive_selection?: Record + breakers?: Record + fs?: NodesFileSystem + host?: Host + http?: NodesHttp + ingest?: NodesIngest + ip?: Ip | Ip[] + jvm?: NodesJvm + name?: Name + os?: NodesOperatingSystem + process?: NodesProcess + roles?: NodeRoles + script?: NodesScripting + script_cache?: Record + thread_pool?: Record + timestamp?: long + transport?: NodesTransport + transport_address?: TransportAddress + attributes?: Record + discovery?: NodesDiscovery + indexing_pressure?: NodesIndexingPressure + indices?: IndicesStatsShardStats } export interface NodesThreadCount { - active: long - completed: long - largest: long - queue: long - rejected: long - threads: long + active?: long + completed?: long + largest?: long + queue?: long + rejected?: long + threads?: long } export interface NodesTransport { - rx_count: long - rx_size: string - rx_size_in_bytes: long - server_open: integer - tx_count: long - tx_size: string - tx_size_in_bytes: long + inbound_handling_time_histogram?: NodesTransportHistogram[] + outbound_handling_time_histogram?: NodesTransportHistogram[] + rx_count?: long + rx_size?: string + rx_size_in_bytes?: long + server_open?: integer + tx_count?: long + tx_size?: string + tx_size_in_bytes?: long + total_outbound_connections?: long +} + +export interface NodesTransportHistogram { + count?: long + lt_millis?: long + ge_millis?: long } export interface NodesHotThreadsHotThread { @@ -13261,7 +13503,7 @@ export interface NodesStatsRequest extends RequestBase { } export interface NodesStatsResponse extends NodesNodesResponseBase { - cluster_name: Name + cluster_name?: Name nodes: Record } @@ -13448,7 +13690,6 @@ export type RollupRollupResponse = any export interface RollupRollupSearchRequest extends RequestBase { index: Indices - type?: Type rest_total_hits_as_int?: boolean typed_keys?: boolean aggregations?: Record @@ -13457,13 +13698,13 @@ export interface RollupRollupSearchRequest extends RequestBase { size?: integer } -export interface RollupRollupSearchResponse { +export interface RollupRollupSearchResponse> { took: long timed_out: boolean terminated_early?: boolean _shards: ShardStatistics hits: SearchHitsMetadata - aggregations?: Record + aggregations?: TAggregations } export interface RollupStartJobRequest extends RequestBase { @@ -13613,13 +13854,19 @@ export interface SecurityUser { enabled: boolean } +export interface SecurityAuthenticateApiKey { + id: string + name: Name +} + export interface SecurityAuthenticateRequest extends RequestBase { } export interface SecurityAuthenticateResponse { + api_key?: SecurityAuthenticateApiKey authentication_realm: SecurityRealmInfo - email?: string - full_name?: Name + email?: string | null + full_name?: Name | null lookup_realm: SecurityRealmInfo metadata: Metadata roles: string[] @@ -13715,6 +13962,7 @@ export interface SecurityCreateApiKeyResponse { expiration?: long id: Id name: Name + encoded: string } export interface SecurityCreateApiKeyRoleDescriptor { @@ -14640,11 +14888,11 @@ export interface SqlTranslateResponse { size: long _source: SearchSourceConfig fields: Record[] - sort: SearchSort + sort: Sort } export interface SslCertificatesCertificateInformation { - alias?: string + alias: string | null expiry: DateString format: string has_private_key: boolean @@ -14824,7 +15072,6 @@ export interface TransformPivot { aggregations?: Record aggs?: Record group_by?: Record - max_page_search_size?: integer } export interface TransformPivotGroupByContainer { @@ -14840,17 +15087,18 @@ export interface TransformRetentionPolicy { } export interface TransformRetentionPolicyContainer { - time: TransformRetentionPolicy + time?: TransformRetentionPolicy } export interface TransformSettings { + align_checkpoints?: boolean dates_as_epoch_millis?: boolean docs_per_second?: float max_page_search_size?: integer } export interface TransformSyncContainer { - time: TransformTimeSync + time?: TransformTimeSync } export interface TransformTimeSync { @@ -14859,8 +15107,9 @@ export interface TransformTimeSync { } export interface TransformDeleteTransformRequest extends RequestBase { - transform_id: Name + transform_id: Id force?: boolean + timeout?: Time } export interface TransformDeleteTransformResponse extends AcknowledgedResponseBase { @@ -14945,6 +15194,7 @@ export interface TransformGetTransformStatsTransformStats { export interface TransformPreviewTransformRequest extends RequestBase { transform_id?: Id + timeout?: Time dest?: ReindexDestination description?: string frequency?: Time @@ -14964,22 +15214,32 @@ export interface TransformPreviewTransformResponse { export interface TransformPutTransformRequest extends RequestBase { transform_id: Id defer_validation?: boolean + timeout?: Time dest: ReindexDestination description?: string frequency?: Time - pivot?: TransformPivot - source: ReindexSource - settings?: TransformSettings - sync?: TransformSyncContainer - retention_policy?: TransformRetentionPolicyContainer latest?: TransformLatest + _meta?: Record + pivot?: TransformPivot + retention_policy?: TransformRetentionPolicyContainer + settings?: TransformSettings + source: ReindexSource + sync?: TransformSyncContainer } export interface TransformPutTransformResponse extends AcknowledgedResponseBase { } +export interface TransformResetTransformRequest extends RequestBase { + transform_id: Id + force?: boolean +} + +export interface TransformResetTransformResponse extends AcknowledgedResponseBase { +} + export interface TransformStartTransformRequest extends RequestBase { - transform_id: Name + transform_id: Id timeout?: Time } @@ -15001,6 +15261,7 @@ export interface TransformStopTransformResponse extends AcknowledgedResponseBase export interface TransformUpdateTransformRequest extends RequestBase { transform_id: Id defer_validation?: boolean + timeout?: Time dest?: ReindexDestination description?: string frequency?: Time @@ -15016,13 +15277,26 @@ export interface TransformUpdateTransformResponse { dest: ReindexDestination frequency: Time id: Id - pivot: TransformPivot + latest?: TransformLatest + pivot?: TransformPivot + retention_policy?: TransformRetentionPolicyContainer settings: TransformSettings source: ReindexSource sync?: TransformSyncContainer version: VersionString } +export interface TransformUpgradeTransformsRequest extends RequestBase { + dry_run?: boolean + timeout?: Time +} + +export interface TransformUpgradeTransformsResponse { + needs_update: integer + no_action: integer + updated: integer +} + export interface WatcherAcknowledgeState { state: WatcherAcknowledgementOptions timestamp: DateString @@ -15252,14 +15526,6 @@ export interface WatcherIndexResultSummary { index: IndexName result: Result version: VersionNumber - type?: Type -} - -export interface WatcherIndicesOptions { - allow_no_indices?: boolean - expand_wildcards?: ExpandWildcards - ignore_unavailable?: boolean - ignore_throttled?: boolean } export interface WatcherInputContainer { @@ -15364,7 +15630,7 @@ export interface WatcherSearchInputRequestBody { export interface WatcherSearchInputRequestDefinition { body?: WatcherSearchInputRequestBody indices?: IndexName[] - indices_options?: WatcherIndicesOptions + indices_options?: IndicesOptions search_type?: SearchType template?: SearchTemplateRequest rest_total_hits_as_int?: boolean @@ -15443,11 +15709,11 @@ export interface WatcherTimeOfYear { } export interface WatcherTriggerContainer { - schedule: WatcherScheduleContainer + schedule?: WatcherScheduleContainer } export interface WatcherTriggerEventContainer { - schedule: WatcherScheduleTriggerEvent + schedule?: WatcherScheduleTriggerEvent } export interface WatcherTriggerEventResult { @@ -15588,8 +15854,8 @@ export interface WatcherQueryWatchesRequest extends RequestBase { from?: integer size?: integer query?: QueryDslQueryContainer - sort?: SearchSort - search_after?: SearchSortResults + sort?: Sort + search_after?: SortResults } export interface WatcherQueryWatchesResponse { @@ -16111,10 +16377,10 @@ export interface XpackUsageWatcherWatchTriggerSchedule extends XpackUsageCounter _all: XpackUsageCounter } -export interface SpecUtilsAdditionalProperty { +export interface SpecUtilsAdditionalProperties { } -export interface SpecUtilsAdditionalProperties { +export interface SpecUtilsAdditionalProperty { } export interface SpecUtilsCommonQueryParameters { diff --git a/src/api/typesWithBodyKey.ts b/src/api/typesWithBodyKey.ts index be3b3a16d..58c965bd9 100644 --- a/src/api/typesWithBodyKey.ts +++ b/src/api/typesWithBodyKey.ts @@ -58,7 +58,6 @@ export type BulkOperationType = 'index' | 'create' | 'update' | 'delete' export interface BulkRequest extends RequestBase { index?: IndexName - type?: Type pipeline?: string refresh?: Refresh routing?: Routing @@ -88,7 +87,6 @@ export interface BulkResponseItem { result?: string _seq_no?: SequenceNumber _shards?: ShardStatistics - _type?: string _version?: VersionNumber forced_refresh?: boolean get?: InlineGet> @@ -160,7 +158,6 @@ export interface CountResponse { export interface CreateRequest extends RequestBase { id: Id index: IndexName - type?: Type pipeline?: string refresh?: Refresh routing?: Routing @@ -178,7 +175,6 @@ export interface CreateResponse extends WriteResponseBase { export interface DeleteRequest extends RequestBase { id: Id index: IndexName - type?: Type if_primary_term?: long if_seq_no?: SequenceNumber refresh?: Refresh @@ -215,12 +211,8 @@ export interface DeleteByQueryRequest extends RequestBase { scroll_size?: long search_timeout?: Time search_type?: SearchType - size?: long slices?: long sort?: string[] - _source?: SearchSourceConfigParam - _source_excludes?: Fields - _source_includes?: Fields stats?: string[] terminate_after?: long timeout?: Time @@ -289,7 +281,6 @@ export type ExistsResponse = boolean export interface ExistsSourceRequest extends RequestBase { id: Id index: IndexName - type?: Type preference?: string realtime?: boolean refresh?: boolean @@ -338,7 +329,6 @@ export interface ExplainRequest extends RequestBase { export interface ExplainResponse { _index: IndexName - _type?: Type _id: Id matched: boolean explanation?: ExplainExplanationDetail @@ -384,7 +374,6 @@ export interface GetGetResult { _routing?: string _seq_no?: SequenceNumber _source?: TDocument - _type?: Type _version?: VersionNumber } @@ -536,7 +525,6 @@ export interface MgetMultiGetError { error: ErrorCause _id: Id _index: IndexName - _type?: Type } export interface MgetOperation { @@ -545,7 +533,6 @@ export interface MgetOperation { routing?: Routing _source?: SearchSourceConfig stored_fields?: Fields - _type?: Type version?: VersionNumber version_type?: VersionType } @@ -623,7 +610,7 @@ export interface MsearchRequest extends RequestBase { export type MsearchRequestItem = MsearchMultisearchHeader | MsearchMultisearchBody -export type MsearchResponse = MsearchMultiSearchResult +export type MsearchResponse> = MsearchMultiSearchResult export type MsearchResponseItem = MsearchMultiSearchItem | ErrorResponseBase @@ -640,7 +627,7 @@ export interface MsearchTemplateRequest extends RequestBase { export type MsearchTemplateRequestItem = MsearchMultisearchHeader | MsearchTemplateTemplateConfig -export type MsearchTemplateResponse = MsearchMultiSearchResult +export type MsearchTemplateResponse> = MsearchMultiSearchResult export interface MsearchTemplateTemplateConfig { explain?: boolean @@ -738,7 +725,6 @@ export interface RankEvalDocumentRating { export interface RankEvalRankEvalHit { _id: Id _index: IndexName - _type?: Type _score: double } @@ -886,7 +872,7 @@ export interface ReindexSource { remote?: ReindexRemoteSource size?: integer slice?: SlicedScroll - sort?: SearchSort + sort?: Sort _source?: Fields runtime_mappings?: MappingRuntimeFields } @@ -975,7 +961,7 @@ export interface ScrollRequest extends RequestBase { } } -export interface ScrollResponse extends SearchResponse { +export interface ScrollResponse> extends SearchResponse { } export interface SearchRequest extends RequestBase { @@ -1040,10 +1026,10 @@ export interface SearchRequest extends RequestBase { query?: QueryDslQueryContainer rescore?: SearchRescore | SearchRescore[] script_fields?: Record - search_after?: SearchSortResults + search_after?: SortResults size?: integer slice?: SlicedScroll - sort?: SearchSort + sort?: Sort _source?: SearchSourceConfig fields?: (QueryDslFieldAndFormat | Field)[] suggest?: SearchSuggester @@ -1059,14 +1045,13 @@ export interface SearchRequest extends RequestBase { } } -export interface SearchResponse { +export interface SearchResponse> { took: long timed_out: boolean _shards: ShardStatistics hits: SearchHitsMetadata - aggregations?: Record + aggregations?: TAggregations _clusters?: ClusterStatistics - documents?: TDocument[] fields?: Record max_score?: double num_reduce_phases?: long @@ -1165,7 +1150,6 @@ export interface SearchCompletionSuggestOption { fields?: Record _id: string _index: IndexName - _type?: Type _routing?: Routing _score: double _source: TDocument @@ -1225,18 +1209,6 @@ export interface SearchFieldCollapse { max_concurrent_group_searches?: integer } -export interface SearchFieldSort { - missing?: AggregationsMissing - mode?: SearchSortMode - nested?: SearchNestedSortValue - order?: SearchSortOrder - unmapped_type?: MappingFieldType - numeric_type?: SearchFieldSortNumericType - format?: string -} - -export type SearchFieldSortNumericType = 'long' | 'double' | 'date' | 'date_nanos' - export interface SearchFieldSuggester { completion?: SearchCompletionSuggester phrase?: SearchPhraseSuggester @@ -1246,16 +1218,6 @@ export interface SearchFieldSuggester { text?: string } -export interface SearchGeoDistanceSortKeys { - mode?: SearchSortMode - distance_type?: GeoDistanceType - ignore_unmapped?: boolean - order?: SearchSortOrder - unit?: DistanceUnit -} -export type SearchGeoDistanceSort = SearchGeoDistanceSortKeys -& { [property: string]: GeoLocation | GeoLocation[] | SearchSortMode | GeoDistanceType | boolean | SearchSortOrder | DistanceUnit } - export interface SearchHighlight { fields: Record type?: SearchHighlighterType @@ -1316,8 +1278,7 @@ export type SearchHighlighterType = SearchBuiltinHighlighterType | string export interface SearchHit { _index: IndexName _id: Id - _score?: double - _type?: Type + _score?: double | null _explanation?: ExplainExplanation fields?: Record highlight?: Record @@ -1332,13 +1293,13 @@ export interface SearchHit { _seq_no?: SequenceNumber _primary_term?: long _version?: VersionNumber - sort?: SearchSortResults + sort?: SortResults } export interface SearchHitsMetadata { - total: SearchTotalHits | long + total?: SearchTotalHits | long hits: SearchHit[] - max_score?: double + max_score?: double | null } export interface SearchInnerHits { @@ -1353,7 +1314,7 @@ export interface SearchInnerHits { script_fields?: Record seq_no_primary_term?: boolean fields?: Fields - sort?: SearchSort + sort?: Sort _source?: SearchSourceConfig stored_field?: Fields track_scores?: boolean @@ -1380,13 +1341,6 @@ export interface SearchNestedIdentity { _nested?: SearchNestedIdentity } -export interface SearchNestedSortValue { - filter?: QueryDslQueryContainer - max_children?: integer - nested?: SearchNestedSortValue - path: Field -} - export interface SearchPhraseSuggestCollate { params?: Record prune?: boolean @@ -1477,20 +1431,6 @@ export interface SearchRescoreQuery { export type SearchScoreMode = 'avg' | 'max' | 'min' | 'multiply' | 'total' -export interface SearchScoreSort { - order?: SearchSortOrder -} - -export interface SearchScriptSort { - order?: SearchSortOrder - script: Script - type?: SearchScriptSortType - mode?: SearchSortMode - nested?: SearchNestedSortValue -} - -export type SearchScriptSortType = 'string' | 'number' - export interface SearchSearchProfile { collector: SearchCollector[] query: SearchQueryProfile[] @@ -1510,25 +1450,6 @@ export interface SearchSmoothingModelContainer { stupid_backoff?: SearchStupidBackoffSmoothingModel } -export type SearchSort = SearchSortCombinations | SearchSortCombinations[] - -export type SearchSortCombinations = Field | SearchSortOptions - -export type SearchSortMode = 'min' | 'max' | 'sum' | 'avg' | 'median' - -export interface SearchSortOptionsKeys { - _score?: SearchScoreSort - _doc?: SearchScoreSort - _geo_distance?: SearchGeoDistanceSort - _script?: SearchScriptSort -} -export type SearchSortOptions = SearchSortOptionsKeys -& { [property: string]: SearchFieldSort | SearchSortOrder | SearchScoreSort | SearchGeoDistanceSort | SearchScriptSort } - -export type SearchSortOrder = 'asc' | 'desc' - -export type SearchSortResults = (long | double | string | null)[] - export type SearchSourceConfig = boolean | SearchSourceFilter | Fields export type SearchSourceConfigParam = boolean | Fields @@ -1629,7 +1550,7 @@ export interface SearchMvtRequest extends RequestBase { query?: QueryDslQueryContainer runtime_mappings?: MappingRuntimeFields size?: integer - sort?: SearchSort + sort?: Sort } } @@ -1758,7 +1679,6 @@ export interface TermvectorsResponse { _index: IndexName term_vectors?: Record took: long - _type?: Type _version: VersionNumber } @@ -1785,7 +1705,6 @@ export interface TermvectorsToken { export interface UpdateRequest extends RequestBase { id: Id index: IndexName - type?: Type if_primary_term?: long if_seq_no?: SequenceNumber lang?: string @@ -1826,6 +1745,7 @@ export interface UpdateByQueryRequest extends RequestBase { from?: long ignore_unavailable?: boolean lenient?: boolean + max_docs?: long pipeline?: string preference?: string refresh?: boolean @@ -1836,12 +1756,8 @@ export interface UpdateByQueryRequest extends RequestBase { scroll_size?: long search_timeout?: Time search_type?: SearchType - size?: long slices?: long sort?: string[] - _source?: SearchSourceConfigParam - _source_excludes?: Fields - _source_includes?: Fields stats?: string[] terminate_after?: long timeout?: Time @@ -1979,7 +1895,7 @@ export type DistanceUnit = 'in' | 'ft' | 'yd' | 'mi' | 'nmi' | 'km' | 'm' | 'cm' export interface DocStats { count: long - deleted: long + deleted?: long } export interface ElasticsearchVersionInfo { @@ -2031,6 +1947,18 @@ export interface FieldSizeUsage { size_in_bytes: long } +export interface FieldSort { + missing?: AggregationsMissing + mode?: SortMode + nested?: NestedSortValue + order?: SortOrder + unmapped_type?: MappingFieldType + numeric_type?: FieldSortNumericType + format?: string +} + +export type FieldSortNumericType = 'long' | 'double' | 'date' | 'date_nanos' + export type FieldValue = long | double | string | boolean export interface FielddataStats { @@ -2053,6 +1981,16 @@ export type Fuzziness = string | integer export type GeoBounds = CoordsGeoBounds | TopLeftBottomRightGeoBounds | TopRightBottomLeftGeoBounds | WktGeoBounds +export interface GeoDistanceSortKeys { + mode?: SortMode + distance_type?: GeoDistanceType + ignore_unmapped?: boolean + order?: SortOrder + unit?: DistanceUnit +} +export type GeoDistanceSort = GeoDistanceSortKeys +& { [property: string]: GeoLocation | GeoLocation[] | SortMode | GeoDistanceType | boolean | SortOrder | DistanceUnit } + export type GeoDistanceType = 'arc' | 'plane' export type GeoHash = string @@ -2128,6 +2066,13 @@ export interface IndexingStats { export type Indices = IndexName | IndexName[] +export interface IndicesOptions { + allow_no_indices?: boolean + expand_wildcards?: ExpandWildcards + ignore_unavailable?: boolean + ignore_throttled?: boolean +} + export interface IndicesResponseBase extends AcknowledgedResponseBase { _shards?: ShardStatistics } @@ -2195,6 +2140,13 @@ export type Names = Name | Name[] export type Namespace = string +export interface NestedSortValue { + filter?: QueryDslQueryContainer + max_children?: integer + nested?: NestedSortValue + path: Field +} + export interface NodeAttributes { attributes: Record ephemeral_id: Id @@ -2297,7 +2249,7 @@ export interface RequestCacheStats { miss_count: long } -export type Result = 'Error' | 'created' | 'updated' | 'deleted' | 'not_found' | 'noop' +export type Result = 'created' | 'updated' | 'deleted' | 'not_found' | 'noop' export interface Retries { bulk: long @@ -2306,6 +2258,10 @@ export interface Retries { export type Routing = string +export interface ScoreSort { + order?: SortOrder +} + export type Script = InlineScript | string | StoredScriptId export interface ScriptBase { @@ -2319,6 +2275,16 @@ export interface ScriptField { export type ScriptLanguage = BuiltinScriptLanguage | string +export interface ScriptSort { + order?: SortOrder + script: Script + type?: ScriptSortType + mode?: SortMode + nested?: NestedSortValue +} + +export type ScriptSortType = 'string' | 'number' + export interface ScriptTransform { lang: string params: Record @@ -2407,6 +2373,25 @@ export interface SlicedScroll { max: integer } +export type Sort = SortCombinations | SortCombinations[] + +export type SortCombinations = Field | SortOptions + +export type SortMode = 'min' | 'max' | 'sum' | 'avg' | 'median' + +export interface SortOptionsKeys { + _score?: ScoreSort + _doc?: ScoreSort + _geo_distance?: GeoDistanceSort + _script?: ScriptSort +} +export type SortOptions = SortOptionsKeys +& { [property: string]: FieldSort | SortOrder | ScoreSort | GeoDistanceSort | ScriptSort } + +export type SortOrder = 'asc' | 'desc' + +export type SortResults = (long | double | string | null)[] + export interface StoreStats { size?: ByteSize size_in_bytes: integer @@ -2475,10 +2460,6 @@ export interface TranslogStats { export type TransportAddress = string -export type Type = string - -export type Types = Type | Type[] - export type Username = string export type Uuid = string @@ -2513,7 +2494,6 @@ export interface WriteResponseBase { result: Result _seq_no: SequenceNumber _shards: ShardStatistics - _type?: Type _version: VersionNumber forced_refresh?: boolean } @@ -2710,7 +2690,7 @@ export interface AggregationsBucketSortAggregation extends AggregationsAggregati from?: integer gap_policy?: AggregationsGapPolicy size?: integer - sort?: SearchSort + sort?: Sort } export type AggregationsBuckets = Record | TBucket[] @@ -2984,7 +2964,7 @@ export interface AggregationsGeoLineAggregation { point: AggregationsGeoLinePoint sort: AggregationsGeoLineSort include_sort?: boolean - sort_order?: SearchSortOrder + sort_order?: SortOrder size?: integer } @@ -3058,8 +3038,8 @@ export type AggregationsHistogramBucket = AggregationsHistogramBucketKeys & { [property: string]: AggregationsAggregate | string | double | long } export interface AggregationsHistogramOrder { - _count?: SearchSortOrder - _key?: SearchSortOrder + _count?: SortOrder + _key?: SortOrder } export interface AggregationsHoltLinearModelSettings { @@ -3166,11 +3146,11 @@ export interface AggregationsLongTermsAggregate extends AggregationsTermsAggrega } export interface AggregationsLongTermsBucketKeys extends AggregationsTermsBucketBase { - key: string + key: long key_as_string?: string } export type AggregationsLongTermsBucket = AggregationsLongTermsBucketKeys -& { [property: string]: AggregationsAggregate | string | long } +& { [property: string]: AggregationsAggregate | long | string } export interface AggregationsMatrixAggregation extends AggregationsAggregation { fields?: Fields @@ -3183,7 +3163,7 @@ export interface AggregationsMatrixStatsAggregate extends AggregationsAggregateB } export interface AggregationsMatrixStatsAggregation extends AggregationsMatrixAggregation { - mode?: AggregationsMatrixStatsMode + mode?: SortMode } export interface AggregationsMatrixStatsFields { @@ -3197,8 +3177,6 @@ export interface AggregationsMatrixStatsFields { correlation: Record } -export type AggregationsMatrixStatsMode = 'avg' | 'min' | 'max' | 'sum' | 'median' - export interface AggregationsMaxAggregate extends AggregationsSingleMetricAggregateBase { } @@ -3641,7 +3619,7 @@ export type AggregationsTermsAggregationCollectMode = 'depth_first' | 'breadth_f export type AggregationsTermsAggregationExecutionHint = 'map' | 'global_ordinals' | 'global_ordinals_hash' | 'global_ordinals_low_cardinality' -export type AggregationsTermsAggregationOrder = Record | Record[] +export type AggregationsTermsAggregationOrder = Record | Record[] export interface AggregationsTermsBucketBase extends AggregationsMultiBucketBase { doc_count_error?: long @@ -3673,7 +3651,7 @@ export interface AggregationsTopHitsAggregation extends AggregationsMetricAggreg highlight?: SearchHighlight script_fields?: Record size?: integer - sort?: SearchSort + sort?: Sort _source?: SearchSourceConfig stored_fields?: Fields track_scores?: boolean @@ -3692,7 +3670,7 @@ export interface AggregationsTopMetricsAggregate extends AggregationsMultiBucket export interface AggregationsTopMetricsAggregation extends AggregationsMetricAggregationBase { metrics?: AggregationsTopMetricsValue | AggregationsTopMetricsValue[] size?: integer - sort?: SearchSort + sort?: Sort } export interface AggregationsTopMetricsBucketKeys extends AggregationsMultiBucketBase { @@ -5150,7 +5128,6 @@ export interface QueryDslLikeDocument { doc?: any fields?: Field[] _id?: Id - _type?: Type _index?: IndexName per_field_analyzer?: Record routing?: Routing @@ -5256,11 +5233,9 @@ export interface QueryDslNestedQuery extends QueryDslQueryBase { inner_hits?: SearchInnerHits path: Field query: QueryDslQueryContainer - score_mode?: QueryDslNestedScoreMode + score_mode?: QueryDslChildScoreMode } -export type QueryDslNestedScoreMode = 'avg' | 'sum' | 'min' | 'max' | 'none' - export interface QueryDslNumberRangeQuery extends QueryDslRangeQueryBase { gt?: double gte?: double @@ -5370,6 +5345,7 @@ export interface QueryDslQueryContainer { terms?: QueryDslTermsQuery terms_set?: Partial> wildcard?: Partial> + wrapper?: QueryDslWrapperQuery type?: QueryDslTypeQuery } @@ -5599,10 +5575,14 @@ export interface QueryDslWildcardQuery extends QueryDslQueryBase { wildcard?: string } +export interface QueryDslWrapperQuery extends QueryDslQueryBase { + query: string +} + export type QueryDslZeroTermsQuery = 'all' | 'none' -export interface AsyncSearchAsyncSearch { - aggregations?: Record +export interface AsyncSearchAsyncSearch> { + aggregations?: TAggregations _clusters?: ClusterStatistics fields?: Record hits: SearchHitsMetadata @@ -5618,8 +5598,8 @@ export interface AsyncSearchAsyncSearch { took: long } -export interface AsyncSearchAsyncSearchDocumentResponseBase extends AsyncSearchAsyncSearchResponseBase { - response: AsyncSearchAsyncSearch +export interface AsyncSearchAsyncSearchDocumentResponseBase> extends AsyncSearchAsyncSearchResponseBase { + response: AsyncSearchAsyncSearch } export interface AsyncSearchAsyncSearchResponseBase { @@ -5721,10 +5701,10 @@ export interface AsyncSearchSubmitRequest extends RequestBase { query?: QueryDslQueryContainer rescore?: SearchRescore | SearchRescore[] script_fields?: Record - search_after?: SearchSortResults + search_after?: SortResults size?: integer slice?: SlicedScroll - sort?: SearchSort + sort?: Sort _source?: SearchSourceConfig fields?: (QueryDslFieldAndFormat | Field)[] suggest?: SearchSuggester @@ -6286,8 +6266,8 @@ export type CatMasterResponse = CatMasterMasterRecord[] export interface CatMlDataFrameAnalyticsDataFrameAnalyticsRecord { id?: Id - type?: Type - t?: Type + type?: string + t?: string create_time?: string ct?: string createTime?: string @@ -6657,8 +6637,8 @@ export interface CatNodesNodesRecord { v?: VersionString flavor?: string f?: string - type?: Type - t?: Type + type?: string + t?: string build?: string b?: string jdk?: string @@ -6945,8 +6925,8 @@ export interface CatPluginsPluginsRecord { v?: VersionString description?: string d?: string - type?: Type - t?: Type + type?: string + t?: string } export interface CatPluginsRequest extends CatCatRequestBase { @@ -6972,8 +6952,8 @@ export interface CatRecoveryRecoveryRecord { time?: string t?: string ti?: string - type?: Type - ty?: Type + type?: string + ty?: string stage?: string st?: string source_host?: string @@ -7361,8 +7341,8 @@ export interface CatTasksTasksRecord { ti?: Id parent_task_id?: string pti?: string - type?: Type - ty?: Type + type?: string + ty?: string start_time?: string start?: string timestamp?: string @@ -7410,7 +7390,7 @@ export interface CatTemplatesTemplatesRecord { export interface CatThreadPoolRequest extends CatCatRequestBase { thread_pool_patterns?: Names - size?: CatThreadPoolThreadPoolSize + time?: Time } export type CatThreadPoolResponse = CatThreadPoolThreadPoolRecord[] @@ -7458,8 +7438,6 @@ export interface CatThreadPoolThreadPoolRecord { ka?: string } -export type CatThreadPoolThreadPoolSize = 'k' | 'm' | 'g' | 't' | 'p' - export interface CatTransformsRequest extends CatCatRequestBase { transform_id?: Id allow_no_match?: boolean @@ -8942,7 +8920,7 @@ export interface IndicesIndexRoutingAllocation { } export interface IndicesIndexRoutingAllocationDisk { - threshold_enabled: boolean | string + threshold_enabled?: boolean | string } export interface IndicesIndexRoutingAllocationInclude { @@ -8965,8 +8943,8 @@ export type IndicesIndexRoutingRebalanceOptions = 'all' | 'primaries' | 'replica export interface IndicesIndexSegmentSort { field: Fields order: IndicesSegmentSortOrder | IndicesSegmentSortOrder[] - mode?: IndicesSegmentSortMode - missing?: IndicesSegmentSortMissing + mode?: IndicesSegmentSortMode | IndicesSegmentSortMode[] + missing?: IndicesSegmentSortMissing | IndicesSegmentSortMissing[] } export interface IndicesIndexSettingBlocks { @@ -9105,6 +9083,7 @@ export interface IndicesIndexState { aliases?: Record mappings?: MappingTypeMapping settings?: IndicesIndexSettings + defaults?: IndicesIndexSettings data_stream?: DataStreamName } @@ -9290,7 +9269,6 @@ export interface IndicesCloseResponse extends AcknowledgedResponseBase { export interface IndicesCreateRequest extends RequestBase { index: IndexName - include_type_name?: boolean master_timeout?: Time timeout?: Time wait_for_active_shards?: WaitForActiveShards @@ -9436,17 +9414,6 @@ export interface IndicesExistsTemplateRequest extends RequestBase { export type IndicesExistsTemplateResponse = boolean -export interface IndicesExistsTypeRequest extends RequestBase { - index: Indices - type: Types - allow_no_indices?: boolean - expand_wildcards?: ExpandWildcards - ignore_unavailable?: boolean - local?: boolean -} - -export type IndicesExistsTypeResponse = boolean - export interface IndicesFlushRequest extends RequestBase { index?: Indices allow_no_indices?: boolean @@ -9479,7 +9446,6 @@ export interface IndicesGetRequest extends RequestBase { flat_settings?: boolean ignore_unavailable?: boolean include_defaults?: boolean - include_type_name?: boolean local?: boolean master_timeout?: Time } @@ -9541,7 +9507,6 @@ export interface IndicesGetFieldMappingRequest extends RequestBase { expand_wildcards?: ExpandWildcards ignore_unavailable?: boolean include_defaults?: boolean - include_type_name?: boolean local?: boolean } @@ -9578,7 +9543,6 @@ export interface IndicesGetIndexTemplateRequest extends RequestBase { name?: Name local?: boolean flat_settings?: boolean - include_type_name?: boolean master_timeout?: Time } @@ -9596,7 +9560,6 @@ export interface IndicesGetMappingRequest extends RequestBase { allow_no_indices?: boolean expand_wildcards?: ExpandWildcards ignore_unavailable?: boolean - include_type_name?: boolean local?: boolean master_timeout?: Time } @@ -9622,7 +9585,6 @@ export interface IndicesGetSettingsResponse extends DictionaryResponseBase - export interface IndicesRolloverRequest extends RequestBase { alias: IndexAlias new_index?: IndexName dry_run?: boolean - include_type_name?: boolean master_timeout?: Time timeout?: Time wait_for_active_shards?: WaitForActiveShards @@ -9941,7 +9898,7 @@ export interface IndicesRolloverRequest extends RequestBase { body?: { aliases?: Record conditions?: IndicesRolloverRolloverConditions - mappings?: IndicesRolloverIndexRolloverMapping + mappings?: MappingTypeMapping settings?: Record } } @@ -10132,6 +10089,7 @@ export interface IndicesStatsIndexStats { flush?: FlushStats get?: GetStats indexing?: IndexingStats + indices?: IndicesStatsIndicesStats merges?: MergesStats query_cache?: QueryCacheStats recovery?: RecoveryStats @@ -10143,13 +10101,13 @@ export interface IndicesStatsIndexStats { translog?: TranslogStats warmer?: WarmerStats bulk?: BulkStats - shards?: IndicesStatsShardsTotalStats + shard_stats?: IndicesStatsShardsTotalStats } export interface IndicesStatsIndicesStats { - primaries: IndicesStatsIndexStats + primaries?: IndicesStatsIndexStats shards?: Record - total: IndicesStatsIndexStats + total?: IndicesStatsIndexStats uuid?: Uuid } @@ -10165,7 +10123,6 @@ export interface IndicesStatsRequest extends RequestBase { include_segment_file_sizes?: boolean include_unloaded_segments?: boolean level?: Level - types?: Types } export interface IndicesStatsResponse { @@ -10235,29 +10192,31 @@ export interface IndicesStatsShardSequenceNumber { } export interface IndicesStatsShardStats { - commit: IndicesStatsShardCommit - completion: CompletionStats - docs: DocStats - fielddata: FielddataStats - flush: FlushStats - get: GetStats - indexing: IndexingStats - merges: MergesStats - shard_path: IndicesStatsShardPath - query_cache: IndicesStatsShardQueryCache - recovery: RecoveryStats - refresh: RefreshStats - request_cache: RequestCacheStats - retention_leases: IndicesStatsShardRetentionLeases - routing: IndicesStatsShardRouting - search: SearchStats - segments: SegmentsStats - seq_no: IndicesStatsShardSequenceNumber - store: StoreStats - translog: TranslogStats - warmer: WarmerStats + commit?: IndicesStatsShardCommit + completion?: CompletionStats + docs?: DocStats + fielddata?: FielddataStats + flush?: FlushStats + get?: GetStats + indexing?: IndexingStats + merges?: MergesStats + shard_path?: IndicesStatsShardPath + query_cache?: IndicesStatsShardQueryCache + recovery?: RecoveryStats + refresh?: RefreshStats + request_cache?: RequestCacheStats + retention_leases?: IndicesStatsShardRetentionLeases + routing?: IndicesStatsShardRouting + search?: SearchStats + segments?: SegmentsStats + seq_no?: IndicesStatsShardSequenceNumber + store?: StoreStats + translog?: TranslogStats + warmer?: WarmerStats bulk?: BulkStats - shards: IndicesStatsShardsTotalStats + shards?: IndicesStatsShardsTotalStats + shard_stats?: IndicesStatsShardsTotalStats + indices?: IndicesStatsIndicesStats } export interface IndicesStatsShardsTotalStats { @@ -10331,7 +10290,6 @@ export interface IndicesValidateQueryIndicesValidationExplanation { export interface IndicesValidateQueryRequest extends RequestBase { index?: Indices - type?: Types allow_no_indices?: boolean all_shards?: boolean analyzer?: string @@ -10619,7 +10577,7 @@ export type IngestShapeType = 'geo_shape' | 'shape' export interface IngestSortProcessor extends IngestProcessorBase { field: Field - order: SearchSortOrder + order: SortOrder target_field: Field } @@ -10739,7 +10697,6 @@ export interface IngestSimulateDocumentSimulation { _parent?: string _routing?: string _source: Record - _type?: Type } export interface IngestSimulateIngest { @@ -11132,7 +11089,7 @@ export interface MlDatafeed { scroll_size?: integer delayed_data_check_config: MlDelayedDataCheckConfig runtime_mappings?: MappingRuntimeFields - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions } export interface MlDatafeedConfig { @@ -11144,7 +11101,7 @@ export interface MlDatafeedConfig { frequency?: Timestamp indexes?: string[] indices: string[] - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions job_id?: Id max_empty_searches?: integer query: QueryDslQueryContainer @@ -11154,13 +11111,6 @@ export interface MlDatafeedConfig { scroll_size?: integer } -export interface MlDatafeedIndicesOptions { - allow_no_indices?: boolean - expand_wildcards?: ExpandWildcards - ignore_unavailable?: boolean - ignore_throttled?: boolean -} - export type MlDatafeedState = 'started' | 'stopped' | 'starting' | 'stopping' export interface MlDatafeedStats { @@ -11427,6 +11377,8 @@ export interface MlDelayedDataCheckConfig { enabled: boolean } +export type MlDeploymentState = 'started' | 'starting' | 'fully_allocated' + export interface MlDetectionRule { actions?: MlRuleAction[] conditions?: MlRuleCondition[] @@ -11688,6 +11640,10 @@ export interface MlPerPartitionCategorization { stop_on_warn?: boolean } +export type MlPredictedValue = string | double + +export type MlRoutingState = 'failed' | 'started' | 'starting' | 'stopped' | 'stopping' + export type MlRuleAction = 'skip_result' | 'skip_model_update' export interface MlRuleCondition { @@ -11701,6 +11657,12 @@ export interface MlTimingStats { iteration_time?: integer } +export interface MlTopClassEntry { + class_name: string + class_probability: double + class_score: double +} + export interface MlTotalFeatureImportance { feature_name: Name importance: MlTotalFeatureImportanceStatistics[] @@ -11718,6 +11680,23 @@ export interface MlTotalFeatureImportanceStatistics { min: integer } +export interface MlTrainedModelAllocation { + allocation_state: MlDeploymentState + routing_table: Record + start_time: DateString + task_parameters: MlTrainedModelAllocationTaskParameters +} + +export interface MlTrainedModelAllocationRoutingTable { + reason: string + routing_state: MlRoutingState +} + +export interface MlTrainedModelAllocationTaskParameters { + model_bytes: integer + model_id: Id +} + export interface MlTrainedModelConfig { model_id: Id model_type: MlTrainedModelType @@ -11747,6 +11726,14 @@ export interface MlTrainedModelConfigMetadata { total_feature_importance?: MlTotalFeatureImportance[] } +export interface MlTrainedModelEntities { + class_name: string + class_probability: double + entity: string + start_pos: integer + end_pos: integer +} + export interface MlTrainedModelInferenceStats { failure_count: long inference_count: long @@ -12128,8 +12115,8 @@ export interface MlGetCategoriesRequest extends RequestBase { job_id: Id category_id?: CategoryId from?: integer - size?: integer partition_field_value?: string + size?: integer /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ body?: { page?: MlPage @@ -12346,6 +12333,25 @@ export interface MlGetTrainedModelsStatsResponse { trained_model_stats: MlTrainedModelStats[] } +export interface MlInferTrainedModelDeploymentRequest extends RequestBase { + model_id: Id + timeout?: Time + /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ + body?: { + docs: Record[] + } +} + +export interface MlInferTrainedModelDeploymentResponse { + entities?: MlTrainedModelEntities[] + is_truncated?: boolean + predicted_value?: MlPredictedValue[] + predicted_value_sequence?: string + prediction_probability?: double + top_classes: MlTopClassEntry[] + warning?: string +} + export interface MlInfoAnomalyDetectors { categorization_analyzer: MlCategorizationAnalyzer categorization_examples_limit: integer @@ -12537,7 +12543,7 @@ export interface MlPutDatafeedRequest extends RequestBase { frequency?: Time indices?: string[] indexes?: string[] - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions job_id?: Id max_empty_searches?: integer query?: QueryDslQueryContainer @@ -12556,7 +12562,7 @@ export interface MlPutDatafeedResponse { frequency: Time indices: string[] job_id: Id - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions max_empty_searches: integer query: QueryDslQueryContainer query_delay: Time @@ -12728,6 +12734,31 @@ export interface MlPutTrainedModelAliasRequest extends RequestBase { export interface MlPutTrainedModelAliasResponse extends AcknowledgedResponseBase { } +export interface MlPutTrainedModelDefinitionPartRequest extends RequestBase { + model_id: Id + part: integer + /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ + body?: { + definition: string + total_definition_length: long + total_parts: integer + } +} + +export interface MlPutTrainedModelDefinitionPartResponse extends AcknowledgedResponseBase { +} + +export interface MlPutTrainedModelVocabularyRequest extends RequestBase { + model_id: Id + /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ + body?: { + vocabulary: string[] + } +} + +export interface MlPutTrainedModelVocabularyResponse extends AcknowledgedResponseBase { +} + export interface MlResetJobRequest extends RequestBase { job_id: Id wait_for_completion?: boolean @@ -12785,6 +12816,19 @@ export interface MlStartDatafeedResponse { started: boolean } +export interface MlStartTrainedModelDeploymentRequest extends RequestBase { + model_id: Id + inference_threads?: integer + model_threads?: integer + queue_capacity?: integer + timeout?: Time + wait_for?: MlDeploymentState +} + +export interface MlStartTrainedModelDeploymentResponse { + allocation: MlTrainedModelAllocation +} + export interface MlStopDataFrameAnalyticsRequest extends RequestBase { id: Id allow_no_match?: boolean @@ -12813,6 +12857,16 @@ export interface MlStopDatafeedResponse { stopped: boolean } +export interface MlStopTrainedModelDeploymentRequest extends RequestBase { + model_id: Id + allow_no_match?: boolean + force?: boolean +} + +export interface MlStopTrainedModelDeploymentResponse { + stopped: boolean +} + export interface MlUpdateDataFrameAnalyticsRequest extends RequestBase { id: Id /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ @@ -12852,7 +12906,7 @@ export interface MlUpdateDatafeedRequest extends RequestBase { frequency?: Time indices?: string[] indexes?: string[] - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions max_empty_searches?: integer query?: QueryDslQueryContainer query_delay?: Time @@ -12870,7 +12924,7 @@ export interface MlUpdateDatafeedResponse { frequency: Time indices: string[] job_id: Id - indices_options?: MlDatafeedIndicesOptions + indices_options?: IndicesOptions max_empty_searches: integer query: QueryDslQueryContainer query_delay: Time @@ -13008,26 +13062,100 @@ export interface MonitoringBulkResponse { } export interface NodesAdaptiveSelection { - avg_queue_size: long - avg_response_time: long - avg_response_time_ns: long - avg_service_time: string - avg_service_time_ns: long - outgoing_searches: long - rank: string + avg_queue_size?: long + avg_response_time?: long + avg_response_time_ns?: long + avg_service_time?: string + avg_service_time_ns?: long + outgoing_searches?: long + rank?: string } export interface NodesBreaker { - estimated_size: string - estimated_size_in_bytes: long - limit_size: string - limit_size_in_bytes: long - overhead: float - tripped: float + estimated_size?: string + estimated_size_in_bytes?: long + limit_size?: string + limit_size_in_bytes?: long + overhead?: float + tripped?: float +} + +export interface NodesCgroup { + cpuacct?: NodesCpuAcct + cpu?: NodesCgroupCpu + memory?: NodesCgroupMemory +} + +export interface NodesCgroupCpu { + control_group?: string + cfs_period_micros?: integer + cfs_quota_micros?: integer + stat?: NodesCgroupCpuStat +} + +export interface NodesCgroupCpuStat { + number_of_elapsed_periods?: long + number_of_times_throttled?: long + time_throttled_nanos?: long +} + +export interface NodesCgroupMemory { + control_group?: string + limit_in_bytes?: string + usage_in_bytes?: string +} + +export interface NodesClient { + id?: long + agent?: string + local_address?: string + remote_address?: string + last_uri?: string + opened_time_millis?: long + closed_time_millis?: long + last_request_time_millis?: long + request_count?: long + request_size_bytes?: long + x_opaque_id?: string +} + +export interface NodesClusterAppliedStats { + recordings?: NodesRecording[] +} + +export interface NodesClusterStateQueue { + total?: long + pending?: long + committed?: long +} + +export interface NodesClusterStateUpdate { + count?: long + computation_time?: string + computation_time_millis?: long + publication_time?: string + publication_time_millis?: long + context_construction_time?: string + context_construction_time_millis?: long + commit_time?: string + commit_time_millis?: long + completion_time?: string + completion_time_millis?: long + master_apply_time?: string + master_apply_time_millis?: long + notification_time?: string + notification_time_millis?: long +} + +export interface NodesContext { + context?: string + compilations?: long + cache_evictions?: long + compilation_limit_triggered?: long } export interface NodesCpu { - percent: integer + percent?: integer sys?: string sys_in_millis?: long total?: string @@ -13037,182 +13165,306 @@ export interface NodesCpu { load_average?: Record } +export interface NodesCpuAcct { + control_group?: string + usage_nanos?: long +} + export interface NodesDataPathStats { - available: string - available_in_bytes: long - disk_queue: string - disk_reads: long - disk_read_size: string - disk_read_size_in_bytes: long - disk_writes: long - disk_write_size: string - disk_write_size_in_bytes: long - free: string - free_in_bytes: long - mount: string - path: string - total: string - total_in_bytes: long - type: string + available?: string + available_in_bytes?: long + disk_queue?: string + disk_reads?: long + disk_read_size?: string + disk_read_size_in_bytes?: long + disk_writes?: long + disk_write_size?: string + disk_write_size_in_bytes?: long + free?: string + free_in_bytes?: long + mount?: string + path?: string + total?: string + total_in_bytes?: long + type?: string +} + +export interface NodesDiscovery { + cluster_state_queue?: NodesClusterStateQueue + published_cluster_states?: NodesPublishedClusterStates + cluster_state_update?: Record + serialized_cluster_states?: NodesSerializedClusterState + cluster_applier_stats?: NodesClusterAppliedStats } export interface NodesExtendedMemoryStats extends NodesMemoryStats { - free_percent: integer - used_percent: integer + free_percent?: integer + used_percent?: integer } export interface NodesFileSystem { - data: NodesDataPathStats[] - timestamp: long - total: NodesFileSystemTotal + data?: NodesDataPathStats[] + timestamp?: long + total?: NodesFileSystemTotal + io_stats?: NodesIoStats } export interface NodesFileSystemTotal { - available: string - available_in_bytes: long - free: string - free_in_bytes: long - total: string - total_in_bytes: long + available?: string + available_in_bytes?: long + free?: string + free_in_bytes?: long + total?: string + total_in_bytes?: long } export interface NodesGarbageCollector { - collectors: Record + collectors?: Record } export interface NodesGarbageCollectorTotal { - collection_count: long - collection_time: string - collection_time_in_millis: long + collection_count?: long + collection_time?: string + collection_time_in_millis?: long } export interface NodesHttp { - current_open: integer - total_opened: long + current_open?: integer + total_opened?: long + clients?: NodesClient[] +} + +export interface NodesIndexingPressure { + memory?: NodesIndexingPressureMemory +} + +export interface NodesIndexingPressureMemory { + limit_in_bytes?: long + current?: NodesPressureMemory + total?: NodesPressureMemory } export interface NodesIngest { - pipelines: Record - total: NodesIngestTotal + pipelines?: Record + total?: NodesIngestTotal } export interface NodesIngestTotal { - count: long - current: long - failed: long - processors: NodesKeyedProcessor[] - time_in_millis: long + count?: long + current?: long + failed?: long + processors?: Record[] + time_in_millis?: long +} + +export interface NodesIoStatDevice { + device_name?: string + operations?: long + read_kilobytes?: long + read_operations?: long + write_kilobytes?: long + write_operations?: long +} + +export interface NodesIoStats { + devices?: NodesIoStatDevice[] + total?: NodesIoStatDevice } export interface NodesJvm { - buffer_pools: Record - classes: NodesJvmClasses - gc: NodesGarbageCollector - mem: NodesMemoryStats - threads: NodesJvmThreads - timestamp: long - uptime: string - uptime_in_millis: long + buffer_pools?: Record + classes?: NodesJvmClasses + gc?: NodesGarbageCollector + mem?: NodesJvmMemoryStats + threads?: NodesJvmThreads + timestamp?: long + uptime?: string + uptime_in_millis?: long } export interface NodesJvmClasses { - current_loaded_count: long - total_loaded_count: long - total_unloaded_count: long + current_loaded_count?: long + total_loaded_count?: long + total_unloaded_count?: long +} + +export interface NodesJvmMemoryStats { + heap_used_in_bytes?: long + heap_used_percent?: long + heap_committed_in_bytes?: long + heap_max_in_bytes?: long + non_heap_used_in_bytes?: long + non_heap_committed_in_bytes?: long + pools?: Record } export interface NodesJvmThreads { - count: long - peak_count: long + count?: long + peak_count?: long } export interface NodesKeyedProcessor { - statistics: NodesProcess - type: string + stats?: NodesProcessor + type?: string } export interface NodesMemoryStats { + adjusted_total_in_bytes?: long resident?: string resident_in_bytes?: long share?: string share_in_bytes?: long total_virtual?: string total_virtual_in_bytes?: long - total_in_bytes: long - free_in_bytes: long - used_in_bytes: long + total_in_bytes?: long + free_in_bytes?: long + used_in_bytes?: long } export interface NodesNodeBufferPool { - count: long - total_capacity: string - total_capacity_in_bytes: long - used: string - used_in_bytes: long + count?: long + total_capacity?: string + total_capacity_in_bytes?: long + used?: string + used_in_bytes?: long } export interface NodesNodesResponseBase { - _nodes: NodeStatistics + _nodes?: NodeStatistics } export interface NodesOperatingSystem { - cpu: NodesCpu - mem: NodesExtendedMemoryStats - swap: NodesMemoryStats - timestamp: long + cpu?: NodesCpu + mem?: NodesExtendedMemoryStats + swap?: NodesMemoryStats + cgroup?: NodesCgroup + timestamp?: long +} + +export interface NodesPool { + used_in_bytes?: long + max_in_bytes?: long + peak_used_in_bytes?: long + peak_max_in_bytes?: long +} + +export interface NodesPressureMemory { + combined_coordinating_and_primary_in_bytes?: long + coordinating_in_bytes?: long + primary_in_bytes?: long + replica_in_bytes?: long + all_in_bytes?: long + coordinating_rejections?: long + primary_rejections?: long + replica_rejections?: long } export interface NodesProcess { - cpu: NodesCpu - mem: NodesMemoryStats - open_file_descriptors: integer - timestamp: long + cpu?: NodesCpu + mem?: NodesMemoryStats + open_file_descriptors?: integer + max_file_descriptors?: integer + timestamp?: long +} + +export interface NodesProcessor { + count?: long + current?: long + failed?: long + time_in_millis?: long +} + +export interface NodesPublishedClusterStates { + full_states?: long + incompatible_diffs?: long + compatible_diffs?: long +} + +export interface NodesRecording { + name?: string + cumulative_execution_count?: long + cumulative_execution_time?: string + cumulative_execution_time_millis?: long +} + +export interface NodesScriptCache { + cache_evictions?: long + compilation_limit_triggered?: long + compilations?: long + context?: string } export interface NodesScripting { - cache_evictions: long - compilations: long + cache_evictions?: long + compilations?: long + compilation_limit_triggered?: long + contexts?: NodesContext[] +} + +export interface NodesSerializedClusterState { + full_states?: NodesSerializedClusterStateDetail + diffs?: NodesSerializedClusterStateDetail +} + +export interface NodesSerializedClusterStateDetail { + count?: long + uncompressed_size?: string + uncompressed_size_in_bytes?: long + compressed_size?: string + compressed_size_in_bytes?: long } export interface NodesStats { - adaptive_selection: Record - breakers: Record - fs: NodesFileSystem - host: Host - http: NodesHttp - indices: IndicesStatsIndexStats - ingest: NodesIngest - ip: Ip | Ip[] - jvm: NodesJvm - name: Name - os: NodesOperatingSystem - process: NodesProcess - roles: NodeRoles - script: NodesScripting - thread_pool: Record - timestamp: long - transport: NodesTransport - transport_address: TransportAddress - attributes: Record + adaptive_selection?: Record + breakers?: Record + fs?: NodesFileSystem + host?: Host + http?: NodesHttp + ingest?: NodesIngest + ip?: Ip | Ip[] + jvm?: NodesJvm + name?: Name + os?: NodesOperatingSystem + process?: NodesProcess + roles?: NodeRoles + script?: NodesScripting + script_cache?: Record + thread_pool?: Record + timestamp?: long + transport?: NodesTransport + transport_address?: TransportAddress + attributes?: Record + discovery?: NodesDiscovery + indexing_pressure?: NodesIndexingPressure + indices?: IndicesStatsShardStats } export interface NodesThreadCount { - active: long - completed: long - largest: long - queue: long - rejected: long - threads: long + active?: long + completed?: long + largest?: long + queue?: long + rejected?: long + threads?: long } export interface NodesTransport { - rx_count: long - rx_size: string - rx_size_in_bytes: long - server_open: integer - tx_count: long - tx_size: string - tx_size_in_bytes: long + inbound_handling_time_histogram?: NodesTransportHistogram[] + outbound_handling_time_histogram?: NodesTransportHistogram[] + rx_count?: long + rx_size?: string + rx_size_in_bytes?: long + server_open?: integer + tx_count?: long + tx_size?: string + tx_size_in_bytes?: long + total_outbound_connections?: long +} + +export interface NodesTransportHistogram { + count?: long + lt_millis?: long + ge_millis?: long } export interface NodesHotThreadsHotThread { @@ -13622,7 +13874,7 @@ export interface NodesStatsRequest extends RequestBase { } export interface NodesStatsResponse extends NodesNodesResponseBase { - cluster_name: Name + cluster_name?: Name nodes: Record } @@ -13813,7 +14065,6 @@ export type RollupRollupResponse = any export interface RollupRollupSearchRequest extends RequestBase { index: Indices - type?: Type rest_total_hits_as_int?: boolean typed_keys?: boolean /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ @@ -13825,13 +14076,13 @@ export interface RollupRollupSearchRequest extends RequestBase { } } -export interface RollupRollupSearchResponse { +export interface RollupRollupSearchResponse> { took: long timed_out: boolean terminated_early?: boolean _shards: ShardStatistics hits: SearchHitsMetadata - aggregations?: Record + aggregations?: TAggregations } export interface RollupStartJobRequest extends RequestBase { @@ -13984,13 +14235,19 @@ export interface SecurityUser { enabled: boolean } +export interface SecurityAuthenticateApiKey { + id: string + name: Name +} + export interface SecurityAuthenticateRequest extends RequestBase { } export interface SecurityAuthenticateResponse { + api_key?: SecurityAuthenticateApiKey authentication_realm: SecurityRealmInfo - email?: string - full_name?: Name + email?: string | null + full_name?: Name | null lookup_realm: SecurityRealmInfo metadata: Metadata roles: string[] @@ -14092,6 +14349,7 @@ export interface SecurityCreateApiKeyResponse { expiration?: long id: Id name: Name + encoded: string } export interface SecurityCreateApiKeyRoleDescriptor { @@ -15067,11 +15325,11 @@ export interface SqlTranslateResponse { size: long _source: SearchSourceConfig fields: Record[] - sort: SearchSort + sort: Sort } export interface SslCertificatesCertificateInformation { - alias?: string + alias: string | null expiry: DateString format: string has_private_key: boolean @@ -15252,7 +15510,6 @@ export interface TransformPivot { aggregations?: Record aggs?: Record group_by?: Record - max_page_search_size?: integer } export interface TransformPivotGroupByContainer { @@ -15268,17 +15525,18 @@ export interface TransformRetentionPolicy { } export interface TransformRetentionPolicyContainer { - time: TransformRetentionPolicy + time?: TransformRetentionPolicy } export interface TransformSettings { + align_checkpoints?: boolean dates_as_epoch_millis?: boolean docs_per_second?: float max_page_search_size?: integer } export interface TransformSyncContainer { - time: TransformTimeSync + time?: TransformTimeSync } export interface TransformTimeSync { @@ -15287,8 +15545,9 @@ export interface TransformTimeSync { } export interface TransformDeleteTransformRequest extends RequestBase { - transform_id: Name + transform_id: Id force?: boolean + timeout?: Time } export interface TransformDeleteTransformResponse extends AcknowledgedResponseBase { @@ -15373,6 +15632,7 @@ export interface TransformGetTransformStatsTransformStats { export interface TransformPreviewTransformRequest extends RequestBase { transform_id?: Id + timeout?: Time /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ body?: { dest?: ReindexDestination @@ -15395,25 +15655,35 @@ export interface TransformPreviewTransformResponse { export interface TransformPutTransformRequest extends RequestBase { transform_id: Id defer_validation?: boolean + timeout?: Time /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ body?: { dest: ReindexDestination description?: string frequency?: Time - pivot?: TransformPivot - source: ReindexSource - settings?: TransformSettings - sync?: TransformSyncContainer - retention_policy?: TransformRetentionPolicyContainer latest?: TransformLatest + _meta?: Record + pivot?: TransformPivot + retention_policy?: TransformRetentionPolicyContainer + settings?: TransformSettings + source: ReindexSource + sync?: TransformSyncContainer } } export interface TransformPutTransformResponse extends AcknowledgedResponseBase { } +export interface TransformResetTransformRequest extends RequestBase { + transform_id: Id + force?: boolean +} + +export interface TransformResetTransformResponse extends AcknowledgedResponseBase { +} + export interface TransformStartTransformRequest extends RequestBase { - transform_id: Name + transform_id: Id timeout?: Time } @@ -15435,6 +15705,7 @@ export interface TransformStopTransformResponse extends AcknowledgedResponseBase export interface TransformUpdateTransformRequest extends RequestBase { transform_id: Id defer_validation?: boolean + timeout?: Time /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */ body?: { dest?: ReindexDestination @@ -15453,13 +15724,26 @@ export interface TransformUpdateTransformResponse { dest: ReindexDestination frequency: Time id: Id - pivot: TransformPivot + latest?: TransformLatest + pivot?: TransformPivot + retention_policy?: TransformRetentionPolicyContainer settings: TransformSettings source: ReindexSource sync?: TransformSyncContainer version: VersionString } +export interface TransformUpgradeTransformsRequest extends RequestBase { + dry_run?: boolean + timeout?: Time +} + +export interface TransformUpgradeTransformsResponse { + needs_update: integer + no_action: integer + updated: integer +} + export interface WatcherAcknowledgeState { state: WatcherAcknowledgementOptions timestamp: DateString @@ -15689,14 +15973,6 @@ export interface WatcherIndexResultSummary { index: IndexName result: Result version: VersionNumber - type?: Type -} - -export interface WatcherIndicesOptions { - allow_no_indices?: boolean - expand_wildcards?: ExpandWildcards - ignore_unavailable?: boolean - ignore_throttled?: boolean } export interface WatcherInputContainer { @@ -15801,7 +16077,7 @@ export interface WatcherSearchInputRequestBody { export interface WatcherSearchInputRequestDefinition { body?: WatcherSearchInputRequestBody indices?: IndexName[] - indices_options?: WatcherIndicesOptions + indices_options?: IndicesOptions search_type?: SearchType template?: SearchTemplateRequest rest_total_hits_as_int?: boolean @@ -15880,11 +16156,11 @@ export interface WatcherTimeOfYear { } export interface WatcherTriggerContainer { - schedule: WatcherScheduleContainer + schedule?: WatcherScheduleContainer } export interface WatcherTriggerEventContainer { - schedule: WatcherScheduleTriggerEvent + schedule?: WatcherScheduleTriggerEvent } export interface WatcherTriggerEventResult { @@ -16033,8 +16309,8 @@ export interface WatcherQueryWatchesRequest extends RequestBase { from?: integer size?: integer query?: QueryDslQueryContainer - sort?: SearchSort - search_after?: SearchSortResults + sort?: Sort + search_after?: SortResults } } @@ -16557,10 +16833,10 @@ export interface XpackUsageWatcherWatchTriggerSchedule extends XpackUsageCounter _all: XpackUsageCounter } -export interface SpecUtilsAdditionalProperty { +export interface SpecUtilsAdditionalProperties { } -export interface SpecUtilsAdditionalProperties { +export interface SpecUtilsAdditionalProperty { } export interface SpecUtilsCommonQueryParameters { diff --git a/src/helpers.ts b/src/helpers.ts index 525977193..293c23bbe 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -37,7 +37,7 @@ export interface ScrollSearchOptions extends TransportRequestOptions { wait?: number } -export interface ScrollSearchResponse extends TransportResult, unknown> { +export interface ScrollSearchResponse extends TransportResult, unknown> { clear: () => Promise documents: TDocument[] } @@ -170,7 +170,7 @@ export default class Helpers { * @param {object} options - The client optional configuration for this request. * @return {iterator} the async iterator */ - async * scrollSearch (params: T.SearchRequest, options: ScrollSearchOptions = {}): AsyncIterable> { + async * scrollSearch (params: T.SearchRequest, options: ScrollSearchOptions = {}): AsyncIterable> { options.meta = true if (this[kMetaHeader] !== null) { options.headers = options.headers ?? {} @@ -186,9 +186,9 @@ export default class Helpers { params.scroll = params.scroll ?? '1m' appendFilterPath('_scroll_id', params, false) - let response: TransportResult, unknown> | undefined + let response: TransportResult, unknown> | undefined for (let i = 0; i <= maxRetries; i++) { - response = await this[kClient].search(params, options as TransportRequestOptionsWithMeta) + response = await this[kClient].search(params, options as TransportRequestOptionsWithMeta) if (response.statusCode !== 429) break await sleep(wait) } @@ -213,7 +213,7 @@ export default class Helpers { scroll_id = response.body._scroll_id // @ts-expect-error response.clear = clear - addDocumentsGetter(response) + addDocumentsGetter(response) // @ts-expect-error yield response @@ -228,7 +228,8 @@ export default class Helpers { rest_total_hits_as_int: params.rest_total_hits_as_int, scroll_id }, options as TransportRequestOptionsWithMeta) - response = r as TransportResult, unknown> + // @ts-expect-error + response = r as TransportResult, unknown> assert(response !== undefined, 'The response is undefined, please file a bug report') if (response.statusCode !== 429) break await sleep(wait) @@ -866,7 +867,7 @@ export default class Helpers { // Using a getter will improve the overall performances of the code, // as we will reed the documents only if needed. -function addDocumentsGetter (result: TransportResult, unknown>): void { +function addDocumentsGetter (result: TransportResult, unknown>): void { Object.defineProperty(result, 'documents', { get () { if (this.body.hits?.hits != null) { diff --git a/test/unit/api.test.ts b/test/unit/api.test.ts index 7d8f14fcb..80b3a1f7f 100644 --- a/test/unit/api.test.ts +++ b/test/unit/api.test.ts @@ -20,6 +20,7 @@ import { test } from 'tap' import { connection } from '../utils' import { Client } from '../..' +import * as T from '../../lib/api/types' test('Api without body key and top level body', async t => { t.plan(2) @@ -195,3 +196,107 @@ test('Using the body key with a string value', async t => { t.fail(err) } }) + +test('With generic document', async t => { + t.plan(1) + + interface Doc { + foo: string + } + + const Connection = connection.buildMockConnection({ + onRequest (opts) { + return { + statusCode: 200, + body: { + took: 42, + hits: { + hits: [{ + _source: { foo: 'bar' } + }] + }, + aggregations: { + unique: { + buckets: [{ key: 'bar' }] + } + } + } + } + } + }) + + const client = new Client({ + node: 'http://localhost:9200', + Connection + }) + + const response = await client.search({ + index: 'test', + allow_no_indices: true, + query: { match_all: {} }, + aggregations: { + unique: { + terms: { + field: 'foo' + } + } + } + }) + + t.equal(response.hits.hits[0]._source?.foo, 'bar') +}) + +test('With generic document and aggregation', async t => { + t.plan(2) + + interface Doc { + foo: string + } + + interface Aggregations { + unique: T.AggregationsTermsAggregateBase<{ key: string }> + } + + const Connection = connection.buildMockConnection({ + onRequest (opts) { + return { + statusCode: 200, + body: { + took: 42, + hits: { + hits: [{ + _source: { foo: 'bar' } + }] + }, + aggregations: { + unique: { + buckets: [{ key: 'bar' }] + } + } + } + } + } + }) + + const client = new Client({ + node: 'http://localhost:9200', + Connection + }) + + const response = await client.search({ + index: 'test', + allow_no_indices: true, + query: { match_all: {} }, + aggregations: { + unique: { + terms: { + field: 'foo' + } + } + } + }) + + t.equal(response.hits.hits[0]._source?.foo, 'bar') + t.ok(Array.isArray(response.aggregations?.unique.buckets)) +}) +