diff --git a/docs/reference.asciidoc b/docs/reference.asciidoc
index f01106d3a..bf1bcfd9e 100644
--- a/docs/reference.asciidoc
+++ b/docs/reference.asciidoc
@@ -2092,6 +2092,8 @@ client.migration.postFeatureUpgrade(...)
 [discrete]
 ==== clear_trained_model_deployment_cache
 Clear the cached results from a trained model deployment
+
+https://www.elastic.co/guide/en/elasticsearch/reference/8.5/clear-trained-model-deployment-cache.html[Endpoint documentation]
 [source,ts]
 ----
 client.ml.clearTrainedModelDeploymentCache(...)
@@ -2998,6 +3000,8 @@ client.security.authenticate(...)
 [discrete]
 ==== bulk_update_api_keys
 Updates the attributes of multiple existing API keys.
+
+https://www.elastic.co/guide/en/elasticsearch/reference/8.5/security-api-bulk-update-api-keys.html[Endpoint documentation]
 [source,ts]
 ----
 client.security.bulkUpdateApiKeys(...)
diff --git a/src/api/api/field_caps.ts b/src/api/api/field_caps.ts
index 606357720..5678857a8 100644
--- a/src/api/api/field_caps.ts
+++ b/src/api/api/field_caps.ts
@@ -37,12 +37,12 @@ import * as T from '../types'
 import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
-export default async function FieldCapsApi (this: That, params: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.FieldCapsResponse>
-export default async function FieldCapsApi (this: That, params: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.FieldCapsResponse, unknown>>
-export default async function FieldCapsApi (this: That, params: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptions): Promise<T.FieldCapsResponse>
-export default async function FieldCapsApi (this: That, params: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptions): Promise<any> {
+export default async function FieldCapsApi (this: That, params?: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.FieldCapsResponse>
+export default async function FieldCapsApi (this: That, params?: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.FieldCapsResponse, unknown>>
+export default async function FieldCapsApi (this: That, params?: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptions): Promise<T.FieldCapsResponse>
+export default async function FieldCapsApi (this: That, params?: T.FieldCapsRequest | TB.FieldCapsRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = ['index']
-  const acceptedBody: string[] = ['index_filter', 'runtime_mappings']
+  const acceptedBody: string[] = ['fields', 'index_filter', 'runtime_mappings']
   const querystring: Record<string, any> = {}
   // @ts-expect-error
   const userBody: any = params?.body
@@ -53,6 +53,7 @@ export default async function FieldCapsApi (this: That, params: T.FieldCapsReque
     body = userBody != null ? { ...userBody } : undefined
   }
 
+  params = params ?? {}
   for (const key in params) {
     if (acceptedBody.includes(key)) {
       body = body ?? {}
diff --git a/src/api/api/license.ts b/src/api/api/license.ts
index a4fbf34d6..26c4e59e7 100644
--- a/src/api/api/license.ts
+++ b/src/api/api/license.ts
@@ -135,10 +135,10 @@ export default class License {
     return await this.transport.request({ path, method, querystring, body }, options)
   }
 
-  async post (this: That, params: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.LicensePostResponse>
-  async post (this: That, params: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.LicensePostResponse, unknown>>
-  async post (this: That, params: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptions): Promise<T.LicensePostResponse>
-  async post (this: That, params: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptions): Promise<any> {
+  async post (this: That, params?: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.LicensePostResponse>
+  async post (this: That, params?: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.LicensePostResponse, unknown>>
+  async post (this: That, params?: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptions): Promise<T.LicensePostResponse>
+  async post (this: That, params?: T.LicensePostRequest | TB.LicensePostRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['license', 'licenses']
     const querystring: Record<string, any> = {}
@@ -151,6 +151,7 @@ export default class License {
       body = userBody != null ? { ...userBody } : undefined
     }
 
+    params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
         body = body ?? {}
diff --git a/src/api/api/ml.ts b/src/api/api/ml.ts
index 78edd3629..213d98cba 100644
--- a/src/api/api/ml.ts
+++ b/src/api/api/ml.ts
@@ -43,10 +43,10 @@ export default class Ml {
     this.transport = transport
   }
 
-  async clearTrainedModelDeploymentCache (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise<T.TODO>
-  async clearTrainedModelDeploymentCache (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.TODO, unknown>>
-  async clearTrainedModelDeploymentCache (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise<T.TODO>
-  async clearTrainedModelDeploymentCache (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise<any> {
+  async clearTrainedModelDeploymentCache (this: That, params?: T.MlClearTrainedModelDeploymentCacheRequest | TB.MlClearTrainedModelDeploymentCacheRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.MlClearTrainedModelDeploymentCacheResponse>
+  async clearTrainedModelDeploymentCache (this: That, params?: T.MlClearTrainedModelDeploymentCacheRequest | TB.MlClearTrainedModelDeploymentCacheRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.MlClearTrainedModelDeploymentCacheResponse, unknown>>
+  async clearTrainedModelDeploymentCache (this: That, params?: T.MlClearTrainedModelDeploymentCacheRequest | TB.MlClearTrainedModelDeploymentCacheRequest, options?: TransportRequestOptions): Promise<T.MlClearTrainedModelDeploymentCacheResponse>
+  async clearTrainedModelDeploymentCache (this: That, params?: T.MlClearTrainedModelDeploymentCacheRequest | TB.MlClearTrainedModelDeploymentCacheRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['model_id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -56,6 +56,7 @@ export default class Ml {
       if (acceptedPath.includes(key)) {
         continue
       } else if (key !== 'body') {
+        // @ts-expect-error
         querystring[key] = params[key]
       }
     }
diff --git a/src/api/types.ts b/src/api/types.ts
index c98388182..b7aafd780 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -239,7 +239,7 @@ export interface DeleteByQueryResponse {
 }
 
 export interface DeleteByQueryRethrottleRequest extends RequestBase {
-  task_id: Id
+  task_id: TaskId
   requests_per_second?: float
 }
 
@@ -343,11 +343,11 @@ export interface FieldCapsRequest extends RequestBase {
   index?: Indices
   allow_no_indices?: boolean
   expand_wildcards?: ExpandWildcards
-  fields: Fields
   ignore_unavailable?: boolean
   include_unmapped?: boolean
   filters?: string
   types?: string[]
+  fields?: Fields
   index_filter?: QueryDslQueryContainer
   runtime_mappings?: MappingRuntimeFields
 }
@@ -1090,12 +1090,14 @@ export interface SearchAggregationProfileDebug {
   filters?: SearchAggregationProfileDelegateDebugFilter[]
   segments_counted?: integer
   segments_collected?: integer
+  map_reducer?: string
 }
 
 export interface SearchAggregationProfileDelegateDebugFilter {
   results_from_metadata?: integer
   query?: string
   specialized_for?: string
+  segments_counted_in_constant_time?: integer
 }
 
 export type SearchBoundaryScanner = 'chars' | 'sentence' | 'word'
@@ -1166,6 +1168,8 @@ export interface SearchFetchProfile {
 }
 
 export interface SearchFetchProfileBreakdown {
+  load_source?: integer
+  load_source_count?: integer
   load_stored_fields?: integer
   load_stored_fields_count?: integer
   next_reader?: integer
@@ -1227,6 +1231,7 @@ export interface SearchHighlightBase {
 export interface SearchHighlightField extends SearchHighlightBase {
   fragment_offset?: integer
   matched_fields?: Fields
+  analyzer?: AnalysisAnalyzer
 }
 
 export type SearchHighlighterEncoder = 'default' | 'html'
@@ -1328,8 +1333,9 @@ export interface SearchPhraseSuggestHighlight {
 
 export interface SearchPhraseSuggestOption {
   text: string
-  highlighted: string
   score: double
+  highlighted?: string
+  collate_match?: boolean
 }
 
 export interface SearchPhraseSuggester extends SearchSuggesterBase {
@@ -1472,8 +1478,10 @@ export interface SearchTermSuggest extends SearchSuggestBase {
 
 export interface SearchTermSuggestOption {
   text: string
-  freq: long
   score: double
+  freq: long
+  highlighted?: string
+  collate_match?: boolean
 }
 
 export interface SearchTermSuggester extends SearchSuggesterBase {
@@ -1920,7 +1928,7 @@ export interface FieldSort {
 
 export type FieldSortNumericType = 'long' | 'double' | 'date' | 'date_nanos'
 
-export type FieldValue = long | double | string | boolean | any
+export type FieldValue = long | double | string | boolean | null | any
 
 export interface FielddataStats {
   evictions?: long
@@ -1962,6 +1970,8 @@ export interface GeoHashLocation {
 
 export type GeoHashPrecision = number | string
 
+export type GeoHexCell = string
+
 export interface GeoLine {
   type: string
   coordinates: double[][]
@@ -2124,10 +2134,11 @@ export interface NestedSortValue {
 export interface NodeAttributes {
   attributes: Record<string, string>
   ephemeral_id: Id
-  id?: Id
+  id?: NodeId
   name: NodeName
   transport_address: TransportAddress
   roles?: NodeRoles
+  external_id: string
 }
 
 export type NodeId = string
@@ -2260,7 +2271,7 @@ export interface ScriptSort {
   nested?: NestedSortValue
 }
 
-export type ScriptSortType = 'string' | 'number'
+export type ScriptSortType = 'string' | 'number' | 'version'
 
 export interface ScriptTransform {
   lang?: string
@@ -2354,7 +2365,7 @@ export interface ShardsOperationResponseBase {
 
 export interface SlicedScroll {
   field?: Field
-  id: integer
+  id: Id
   max: integer
 }
 
@@ -2379,7 +2390,7 @@ export type SortOptions = SortOptionsKeys
 
 export type SortOrder = 'asc' | 'desc'
 
-export type SortResults = (long | double | string | null)[]
+export type SortResults = FieldValue[]
 
 export interface StoreStats {
   size?: ByteSize
@@ -2519,11 +2530,12 @@ export interface AggregationsAdjacencyMatrixAggregation extends AggregationsBuck
 }
 
 export interface AggregationsAdjacencyMatrixBucketKeys extends AggregationsMultiBucketBase {
+  key: string
 }
 export type AggregationsAdjacencyMatrixBucket = AggregationsAdjacencyMatrixBucketKeys
-& { [property: string]: AggregationsAggregate | long }
+& { [property: string]: AggregationsAggregate | string | long }
 
-export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsChildrenAggregate | AggregationsParentAggregate | AggregationsSamplerAggregate | AggregationsUnmappedSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsGeoLineAggregate
+export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsChildrenAggregate | AggregationsParentAggregate | AggregationsSamplerAggregate | AggregationsUnmappedSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsGeoHexGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsIpPrefixAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsGeoLineAggregate
 
 export interface AggregationsAggregateBase {
   meta?: Metadata
@@ -2574,6 +2586,7 @@ export interface AggregationsAggregationContainer {
   global?: AggregationsGlobalAggregation
   histogram?: AggregationsHistogramAggregation
   ip_range?: AggregationsIpRangeAggregation
+  ip_prefix?: AggregationsIpPrefixAggregation
   inference?: AggregationsInferenceAggregation
   line?: AggregationsGeoLineAggregation
   matrix_stats?: AggregationsMatrixStatsAggregation
@@ -2772,11 +2785,13 @@ export interface AggregationsChildrenAggregation extends AggregationsBucketAggre
 }
 
 export interface AggregationsCompositeAggregate extends AggregationsMultiBucketAggregateBase<AggregationsCompositeBucket> {
-  after_key?: Record<string, any>
+  after_key?: AggregationsCompositeAggregateKey
 }
 
+export type AggregationsCompositeAggregateKey = Record<Field, FieldValue>
+
 export interface AggregationsCompositeAggregation extends AggregationsBucketAggregationBase {
-  after?: Record<string, string | float | null>
+  after?: AggregationsCompositeAggregateKey
   size?: integer
   sources?: Record<string, AggregationsCompositeAggregationSource>[]
 }
@@ -2789,10 +2804,10 @@ export interface AggregationsCompositeAggregationSource {
 }
 
 export interface AggregationsCompositeBucketKeys extends AggregationsMultiBucketBase {
-  key: Record<string, any>
+  key: AggregationsCompositeAggregateKey
 }
 export type AggregationsCompositeBucket = AggregationsCompositeBucketKeys
-& { [property: string]: AggregationsAggregate | Record<string, any> | long }
+& { [property: string]: AggregationsAggregate | AggregationsCompositeAggregateKey | long }
 
 export interface AggregationsCumulativeCardinalityAggregate extends AggregationsAggregateBase {
   value: long
@@ -2903,6 +2918,8 @@ export interface AggregationsExtendedStatsAggregate extends AggregationsStatsAgg
   variance_population: double | null
   variance_sampling: double | null
   std_deviation: double | null
+  std_deviation_population: double | null
+  std_deviation_sampling: double | null
   std_deviation_bounds?: AggregationsStandardDeviationBounds
   sum_of_squares_as_string?: string
   variance_as_string?: string
@@ -2953,7 +2970,7 @@ export interface AggregationsFormattableMetricAggregation extends AggregationsMe
   format?: string
 }
 
-export type AggregationsGapPolicy = 'skip' | 'insert_zeros'
+export type AggregationsGapPolicy = 'skip' | 'insert_zeros' | 'keep_values'
 
 export interface AggregationsGeoBoundsAggregate extends AggregationsAggregateBase {
   bounds?: GeoBounds
@@ -3001,9 +3018,19 @@ export interface AggregationsGeoHashGridBucketKeys extends AggregationsMultiBuck
 export type AggregationsGeoHashGridBucket = AggregationsGeoHashGridBucketKeys
 & { [property: string]: AggregationsAggregate | GeoHash | long }
 
+export interface AggregationsGeoHexGridAggregate extends AggregationsMultiBucketAggregateBase<AggregationsGeoHexGridBucket> {
+}
+
+export interface AggregationsGeoHexGridBucketKeys extends AggregationsMultiBucketBase {
+  key: GeoHexCell
+}
+export type AggregationsGeoHexGridBucket = AggregationsGeoHexGridBucketKeys
+& { [property: string]: AggregationsAggregate | GeoHexCell | long }
+
 export interface AggregationsGeoLineAggregate extends AggregationsAggregateBase {
   type: string
   geometry: GeoLine
+  properties: any
 }
 
 export interface AggregationsGeoLineAggregation {
@@ -3155,6 +3182,27 @@ export interface AggregationsInferenceTopClassEntry {
   class_score: double
 }
 
+export interface AggregationsIpPrefixAggregate extends AggregationsMultiBucketAggregateBase<AggregationsIpPrefixBucket> {
+}
+
+export interface AggregationsIpPrefixAggregation extends AggregationsBucketAggregationBase {
+  field: Field
+  prefix_length: integer
+  is_ipv6?: boolean
+  append_prefix_length?: boolean
+  keyed?: boolean
+  min_doc_count?: long
+}
+
+export interface AggregationsIpPrefixBucketKeys extends AggregationsMultiBucketBase {
+  is_ipv6: boolean
+  key: string
+  prefix_length: integer
+  netmask?: string
+}
+export type AggregationsIpPrefixBucket = AggregationsIpPrefixBucketKeys
+& { [property: string]: AggregationsAggregate | boolean | string | integer | long }
+
 export interface AggregationsIpRangeAggregate extends AggregationsMultiBucketAggregateBase<AggregationsIpRangeBucket> {
 }
 
@@ -3170,6 +3218,7 @@ export interface AggregationsIpRangeAggregationRange {
 }
 
 export interface AggregationsIpRangeBucketKeys extends AggregationsMultiBucketBase {
+  key?: string
   from?: string
   to?: string
 }
@@ -3322,12 +3371,12 @@ export interface AggregationsMultiTermsAggregation extends AggregationsBucketAgg
 }
 
 export interface AggregationsMultiTermsBucketKeys extends AggregationsMultiBucketBase {
-  key: (long | double | string)[]
+  key: FieldValue[]
   key_as_string?: string
   doc_count_error_upper_bound?: long
 }
 export type AggregationsMultiTermsBucket = AggregationsMultiTermsBucketKeys
-& { [property: string]: AggregationsAggregate | (long | double | string)[] | string | long }
+& { [property: string]: AggregationsAggregate | FieldValue[] | string | long }
 
 export interface AggregationsMutualInformationHeuristic {
   background_is_superset?: boolean
@@ -3477,7 +3526,7 @@ export interface AggregationsSerialDifferencingAggregation extends AggregationsP
   lag?: integer
 }
 
-export interface AggregationsSignificantLongTermsAggregate extends AggregationsMultiBucketAggregateBase<AggregationsSignificantLongTermsBucket> {
+export interface AggregationsSignificantLongTermsAggregate extends AggregationsSignificantTermsAggregateBase<AggregationsSignificantLongTermsBucket> {
 }
 
 export interface AggregationsSignificantLongTermsBucketKeys extends AggregationsSignificantTermsBucketBase {
@@ -3487,7 +3536,7 @@ export interface AggregationsSignificantLongTermsBucketKeys extends Aggregations
 export type AggregationsSignificantLongTermsBucket = AggregationsSignificantLongTermsBucketKeys
 & { [property: string]: AggregationsAggregate | long | string | double }
 
-export interface AggregationsSignificantStringTermsAggregate extends AggregationsMultiBucketAggregateBase<AggregationsSignificantStringTermsBucket> {
+export interface AggregationsSignificantStringTermsAggregate extends AggregationsSignificantTermsAggregateBase<AggregationsSignificantStringTermsBucket> {
 }
 
 export interface AggregationsSignificantStringTermsBucketKeys extends AggregationsSignificantTermsBucketBase {
@@ -3496,6 +3545,11 @@ export interface AggregationsSignificantStringTermsBucketKeys extends Aggregatio
 export type AggregationsSignificantStringTermsBucket = AggregationsSignificantStringTermsBucketKeys
 & { [property: string]: AggregationsAggregate | string | double | long }
 
+export interface AggregationsSignificantTermsAggregateBase<T = unknown> extends AggregationsMultiBucketAggregateBase<T> {
+  bg_count?: long
+  doc_count?: long
+}
+
 export interface AggregationsSignificantTermsAggregation extends AggregationsBucketAggregationBase {
   background_filter?: QueryDslQueryContainer
   chi_square?: AggregationsChiSquareHeuristic
@@ -3624,10 +3678,10 @@ export interface AggregationsStringTermsAggregate extends AggregationsTermsAggre
 }
 
 export interface AggregationsStringTermsBucketKeys extends AggregationsTermsBucketBase {
-  key: string
+  key: FieldValue
 }
 export type AggregationsStringTermsBucket = AggregationsStringTermsBucketKeys
-& { [property: string]: AggregationsAggregate | string | long }
+& { [property: string]: AggregationsAggregate | FieldValue | long }
 
 export interface AggregationsSumAggregate extends AggregationsSingleMetricAggregateBase {
 }
@@ -3663,7 +3717,7 @@ export type AggregationsTTestType = 'paired' | 'homoscedastic' | 'heteroscedasti
 
 export interface AggregationsTermsAggregateBase<TBucket = unknown> extends AggregationsMultiBucketAggregateBase<TBucket> {
   doc_count_error_upper_bound?: long
-  sum_other_doc_count: long
+  sum_other_doc_count?: long
 }
 
 export interface AggregationsTermsAggregation extends AggregationsBucketAggregationBase {
@@ -3754,7 +3808,7 @@ export interface AggregationsUnmappedSamplerAggregateKeys extends AggregationsSi
 export type AggregationsUnmappedSamplerAggregate = AggregationsUnmappedSamplerAggregateKeys
 & { [property: string]: AggregationsAggregate | long | Metadata }
 
-export interface AggregationsUnmappedSignificantTermsAggregate extends AggregationsMultiBucketAggregateBase<void> {
+export interface AggregationsUnmappedSignificantTermsAggregate extends AggregationsSignificantTermsAggregateBase<void> {
 }
 
 export interface AggregationsUnmappedTermsAggregate extends AggregationsTermsAggregateBase<void> {
@@ -4435,6 +4489,7 @@ export interface MappingAggregateMetricDoubleProperty extends MappingPropertyBas
   type: 'aggregate_metric_double'
   default_metric: string
   metrics: string[]
+  time_series_metric?: MappingTimeSeriesMetricType
 }
 
 export interface MappingAllField {
@@ -4462,7 +4517,7 @@ export interface MappingBooleanProperty extends MappingDocValuesPropertyBase {
   type: 'boolean'
 }
 
-export interface MappingByteNumberProperty extends MappingStandardNumberProperty {
+export interface MappingByteNumberProperty extends MappingNumberPropertyBase {
   type: 'byte'
   null_value?: byte
 }
@@ -4537,7 +4592,7 @@ export interface MappingDocValuesPropertyBase extends MappingCorePropertyBase {
   doc_values?: boolean
 }
 
-export interface MappingDoubleNumberProperty extends MappingStandardNumberProperty {
+export interface MappingDoubleNumberProperty extends MappingNumberPropertyBase {
   type: 'double'
   null_value?: double
 }
@@ -4613,7 +4668,7 @@ export interface MappingFlattenedProperty extends MappingPropertyBase {
   type: 'flattened'
 }
 
-export interface MappingFloatNumberProperty extends MappingStandardNumberProperty {
+export interface MappingFloatNumberProperty extends MappingNumberPropertyBase {
   type: 'float'
   null_value?: float
 }
@@ -4642,7 +4697,7 @@ export interface MappingGeoShapeProperty extends MappingDocValuesPropertyBase {
 
 export type MappingGeoStrategy = 'recursive' | 'term'
 
-export interface MappingHalfFloatNumberProperty extends MappingStandardNumberProperty {
+export interface MappingHalfFloatNumberProperty extends MappingNumberPropertyBase {
   type: 'half_float'
   null_value?: float
 }
@@ -4658,7 +4713,7 @@ export interface MappingIndexField {
 
 export type MappingIndexOptions = 'docs' | 'freqs' | 'positions' | 'offsets'
 
-export interface MappingIntegerNumberProperty extends MappingStandardNumberProperty {
+export interface MappingIntegerNumberProperty extends MappingNumberPropertyBase {
   type: 'integer'
   null_value?: integer
 }
@@ -4670,8 +4725,11 @@ export interface MappingIntegerRangeProperty extends MappingRangePropertyBase {
 export interface MappingIpProperty extends MappingDocValuesPropertyBase {
   boost?: double
   index?: boolean
-  null_value?: string
   ignore_malformed?: boolean
+  null_value?: string
+  on_script_error?: MappingOnScriptError
+  script?: Script
+  time_series_dimension?: boolean
   type: 'ip'
 }
 
@@ -4681,6 +4739,7 @@ export interface MappingIpRangeProperty extends MappingRangePropertyBase {
 
 export interface MappingJoinProperty extends MappingPropertyBase {
   relations?: Record<RelationName, RelationName | RelationName[]>
+  eager_global_ordinals?: boolean
   type: 'join'
 }
 
@@ -4697,7 +4756,7 @@ export interface MappingKeywordProperty extends MappingDocValuesPropertyBase {
   type: 'keyword'
 }
 
-export interface MappingLongNumberProperty extends MappingStandardNumberProperty {
+export interface MappingLongNumberProperty extends MappingNumberPropertyBase {
   type: 'long'
   null_value?: long
 }
@@ -4727,9 +4786,14 @@ export interface MappingNestedProperty extends MappingCorePropertyBase {
 }
 
 export interface MappingNumberPropertyBase extends MappingDocValuesPropertyBase {
-  index?: boolean
+  boost?: double
+  coerce?: boolean
   ignore_malformed?: boolean
+  index?: boolean
+  on_script_error?: MappingOnScriptError
+  script?: Script
   time_series_metric?: MappingTimeSeriesMetricType
+  time_series_dimension?: boolean
 }
 
 export interface MappingObjectProperty extends MappingCorePropertyBase {
@@ -4792,7 +4856,6 @@ export type MappingRuntimeFields = Record<Field, MappingRuntimeField>
 
 export interface MappingScaledFloatNumberProperty extends MappingNumberPropertyBase {
   type: 'scaled_float'
-  coerce?: boolean
   null_value?: double
   scaling_factor?: double
 }
@@ -4817,7 +4880,7 @@ export interface MappingShapeProperty extends MappingDocValuesPropertyBase {
   type: 'shape'
 }
 
-export interface MappingShortNumberProperty extends MappingStandardNumberProperty {
+export interface MappingShortNumberProperty extends MappingNumberPropertyBase {
   type: 'short'
   null_value?: short
 }
@@ -4832,13 +4895,10 @@ export interface MappingSourceField {
   enabled?: boolean
   excludes?: string[]
   includes?: string[]
+  mode?: MappingSourceFieldMode
 }
 
-export interface MappingStandardNumberProperty extends MappingNumberPropertyBase {
-  coerce?: boolean
-  script?: Script
-  on_script_error?: MappingOnScriptError
-}
+export type MappingSourceFieldMode = 'disabled' | 'stored' | 'synthetic'
 
 export interface MappingSuggestContext {
   name: Name
@@ -8558,22 +8618,19 @@ export interface DanglingIndicesListDanglingIndicesResponse {
   dangling_indices: DanglingIndicesListDanglingIndicesDanglingIndex[]
 }
 
-export interface EnrichConfiguration {
-  geo_match?: EnrichPolicy
-  match: EnrichPolicy
-  range: EnrichPolicy
-}
-
 export interface EnrichPolicy {
   enrich_fields: Fields
   indices: Indices
   match_field: Field
   query?: string
   name?: Name
+  elasticsearch_version?: string
 }
 
+export type EnrichPolicyType = 'geo_match' | 'match' | 'range'
+
 export interface EnrichSummary {
-  config: EnrichConfiguration
+  config: Partial<Record<EnrichPolicyType, EnrichPolicy>>
 }
 
 export interface EnrichDeletePolicyRequest extends RequestBase {
@@ -9159,6 +9216,10 @@ export interface IndicesDataStreamVisibility {
   hidden?: boolean
 }
 
+export interface IndicesDownsampleConfig {
+  fixed_interval: DurationLarge
+}
+
 export interface IndicesFielddataFrequencyFilter {
   max: double
   min: double
@@ -9335,6 +9396,7 @@ export interface IndicesIndexTemplateSummary {
 
 export interface IndicesIndexVersioning {
   created?: VersionString
+  created_string?: string
 }
 
 export interface IndicesIndexingPressure {
@@ -9346,6 +9408,7 @@ export interface IndicesIndexingPressureMemory {
 }
 
 export interface IndicesMappingLimitSettings {
+  coerce?: boolean
   total_fields?: IndicesMappingLimitSettingsTotalFields
   depth?: IndicesMappingLimitSettingsDepth
   nested_fields?: IndicesMappingLimitSettingsNestedFields
@@ -9440,7 +9503,7 @@ export interface IndicesSettingsSimilarity {
 }
 
 export interface IndicesSettingsSimilarityBm25 {
-  b: integer
+  b: double
   discount_overlaps: boolean
   k1: double
   type: 'BM25'
@@ -9779,7 +9842,7 @@ export type IndicesDiskUsageResponse = any
 export interface IndicesDownsampleRequest extends RequestBase {
   index: IndexName
   target_index: IndexName
-  config?: any
+  config?: IndicesDownsampleConfig
 }
 
 export type IndicesDownsampleResponse = any
@@ -9901,7 +9964,11 @@ export interface IndicesForcemergeRequest extends RequestBase {
   wait_for_completion?: boolean
 }
 
-export type IndicesForcemergeResponse = ShardsOperationResponseBase
+export type IndicesForcemergeResponse = IndicesForcemergeForceMergeResponseBody
+
+export interface IndicesForcemergeForceMergeResponseBody extends ShardsOperationResponseBase {
+  task?: string
+}
 
 export type IndicesGetFeature = 'aliases' | 'mappings' | 'settings'
 
@@ -10333,13 +10400,18 @@ export interface IndicesRolloverResponse {
 }
 
 export interface IndicesRolloverRolloverConditions {
+  min_age?: Duration
   max_age?: Duration
   max_age_millis?: DurationValue<UnitMillis>
+  min_docs?: long
   max_docs?: long
-  max_size?: string
+  max_size?: ByteSize
+  min_size?: ByteSize
   max_size_bytes?: ByteSize
   max_primary_shard_size?: ByteSize
-  max_primary_shard_size_bytes?: ByteSize
+  min_primary_shard_size?: ByteSize
+  max_primary_shard_docs?: long
+  min_primary_shard_docs?: long
 }
 
 export interface IndicesSegmentsIndexSegment {
@@ -10755,39 +10827,38 @@ export interface IngestBytesProcessor extends IngestProcessorBase {
 export interface IngestCircleProcessor extends IngestProcessorBase {
   error_distance: double
   field: Field
-  ignore_missing: boolean
+  ignore_missing?: boolean
   shape_type: IngestShapeType
-  target_field: Field
+  target_field?: Field
 }
 
 export interface IngestConvertProcessor extends IngestProcessorBase {
   field: Field
   ignore_missing?: boolean
-  target_field: Field
+  target_field?: Field
   type: IngestConvertType
 }
 
 export type IngestConvertType = 'integer' | 'long' | 'float' | 'double' | 'string' | 'boolean' | 'auto'
 
 export interface IngestCsvProcessor extends IngestProcessorBase {
-  empty_value: any
-  description?: string
+  empty_value?: any
   field: Field
   ignore_missing?: boolean
   quote?: string
   separator?: string
   target_fields: Fields
-  trim: boolean
+  trim?: boolean
 }
 
 export interface IngestDateIndexNameProcessor extends IngestProcessorBase {
   date_formats: string[]
   date_rounding: string
   field: Field
-  index_name_format: string
-  index_name_prefix: string
-  locale: string
-  timezone: string
+  index_name_format?: string
+  index_name_prefix?: string
+  locale?: string
+  timezone?: string
 }
 
 export interface IngestDateProcessor extends IngestProcessorBase {
@@ -10799,9 +10870,9 @@ export interface IngestDateProcessor extends IngestProcessorBase {
 }
 
 export interface IngestDissectProcessor extends IngestProcessorBase {
-  append_separator: string
+  append_separator?: string
   field: Field
-  ignore_missing: boolean
+  ignore_missing?: boolean
   pattern: string
 }
 
@@ -10834,18 +10905,18 @@ export interface IngestForeachProcessor extends IngestProcessorBase {
 }
 
 export interface IngestGeoIpProcessor extends IngestProcessorBase {
-  database_file: string
+  database_file?: string
   field: Field
-  first_only: boolean
-  ignore_missing: boolean
-  properties: string[]
-  target_field: Field
+  first_only?: boolean
+  ignore_missing?: boolean
+  properties?: string[]
+  target_field?: Field
 }
 
 export interface IngestGrokProcessor extends IngestProcessorBase {
   field: Field
   ignore_missing?: boolean
-  pattern_definitions: Record<string, string>
+  pattern_definitions?: Record<string, string>
   patterns: string[]
   trace_match?: boolean
 }
@@ -10878,7 +10949,7 @@ export interface IngestInferenceConfigRegression {
 
 export interface IngestInferenceProcessor extends IngestProcessorBase {
   model_id: Id
-  target_field: Field
+  target_field?: Field
   field_map?: Record<Field, any>
   inference_config?: IngestInferenceConfig
 }
@@ -10890,11 +10961,15 @@ export interface IngestJoinProcessor extends IngestProcessorBase {
 }
 
 export interface IngestJsonProcessor extends IngestProcessorBase {
-  add_to_root: boolean
+  add_to_root?: boolean
+  add_to_root_conflict_strategy?: IngestJsonProcessorConflictStrategy
+  allow_duplicate_keys?: boolean
   field: Field
-  target_field: Field
+  target_field?: Field
 }
 
+export type IngestJsonProcessorConflictStrategy = 'replace' | 'merge'
+
 export interface IngestKeyValueProcessor extends IngestProcessorBase {
   exclude_keys?: string[]
   field: Field
@@ -10930,9 +11005,11 @@ export interface IngestPipelineConfig {
 
 export interface IngestPipelineProcessor extends IngestProcessorBase {
   name: Name
+  ignore_missing_pipeline?: boolean
 }
 
 export interface IngestProcessorBase {
+  description?: string
   if?: string
   ignore_failure?: boolean
   on_failure?: IngestProcessorContainer[]
@@ -10988,9 +11065,12 @@ export interface IngestRenameProcessor extends IngestProcessorBase {
 }
 
 export interface IngestSetProcessor extends IngestProcessorBase {
+  copy_from?: Field
   field: Field
+  ignore_empty_value?: boolean
+  media_type?: string
   override?: boolean
-  value: any
+  value?: any
 }
 
 export interface IngestSetSecurityUserProcessor extends IngestProcessorBase {
@@ -11002,8 +11082,8 @@ export type IngestShapeType = 'geo_shape' | 'shape'
 
 export interface IngestSortProcessor extends IngestProcessorBase {
   field: Field
-  order: SortOrder
-  target_field: Field
+  order?: SortOrder
+  target_field?: Field
 }
 
 export interface IngestSplitProcessor extends IngestProcessorBase {
@@ -11034,10 +11114,10 @@ export interface IngestUrlDecodeProcessor extends IngestProcessorBase {
 
 export interface IngestUserAgentProcessor extends IngestProcessorBase {
   field: Field
-  ignore_missing: boolean
-  options: IngestUserAgentProperty[]
-  regex_file: string
-  target_field: Field
+  ignore_missing?: boolean
+  options?: IngestUserAgentProperty[]
+  regex_file?: string
+  target_field?: Field
 }
 
 export type IngestUserAgentProperty = 'NAME' | 'MAJOR' | 'MINOR' | 'PATCH' | 'OS' | 'OS_NAME' | 'OS_MAJOR' | 'OS_MINOR' | 'DEVICE' | 'BUILD'
@@ -11110,14 +11190,17 @@ export interface IngestSimulateDocument {
   _source: any
 }
 
-export interface IngestSimulateDocumentSimulation {
+export interface IngestSimulateDocumentSimulationKeys {
   _id: Id
   _index: IndexName
   _ingest: IngestSimulateIngest
-  _parent?: string
   _routing?: string
   _source: Record<string, any>
+  _version?: SpecUtilsStringified<VersionNumber>
+  _version_type?: VersionType
 }
+export type IngestSimulateDocumentSimulation = IngestSimulateDocumentSimulationKeys
+& { [property: string]: string | Id | IndexName | IngestSimulateIngest | Record<string, any> | SpecUtilsStringified<VersionNumber> | VersionType }
 
 export interface IngestSimulateIngest {
   timestamp: DateTime
@@ -11211,7 +11294,7 @@ export interface LicensePostAcknowledgement {
 export interface LicensePostRequest extends RequestBase {
   acknowledge?: boolean
   license?: LicenseLicense
-  licenses: LicenseLicense[]
+  licenses?: LicenseLicense[]
 }
 
 export interface LicensePostResponse {
@@ -12513,6 +12596,14 @@ export interface MlZeroShotClassificationInferenceUpdateOptions {
   labels: string[]
 }
 
+export interface MlClearTrainedModelDeploymentCacheRequest extends RequestBase {
+  model_id?: Id
+}
+
+export interface MlClearTrainedModelDeploymentCacheResponse {
+  cleared: boolean
+}
+
 export interface MlCloseJobRequest extends RequestBase {
   job_id: Id
   allow_no_match?: boolean
@@ -14914,7 +15005,7 @@ export interface SecurityFieldRule {
 
 export interface SecurityFieldSecurity {
   except?: Fields
-  grant: Fields
+  grant?: Fields
 }
 
 export interface SecurityGlobalPrivilege {
@@ -14985,17 +15076,19 @@ export interface SecurityRoleMappingRule {
   except?: SecurityRoleMappingRule
 }
 
+export type SecurityRoleTemplateInlineQuery = string | QueryDslQueryContainer
+
 export interface SecurityRoleTemplateInlineScript extends ScriptBase {
   lang?: ScriptLanguage
   options?: Record<string, string>
-  source: string | QueryDslQueryContainer
+  source: SecurityRoleTemplateInlineQuery
 }
 
 export interface SecurityRoleTemplateQuery {
   template?: SecurityRoleTemplateScript
 }
 
-export type SecurityRoleTemplateScript = SecurityRoleTemplateInlineScript | string | QueryDslQueryContainer | StoredScriptId
+export type SecurityRoleTemplateScript = SecurityRoleTemplateInlineScript | SecurityRoleTemplateInlineQuery | StoredScriptId
 
 export interface SecurityTransientMetadataConfig {
   enabled: boolean
@@ -15011,6 +15104,14 @@ export interface SecurityUser {
   profile_uid?: SecurityUserProfileId
 }
 
+export interface SecurityUserIndicesPrivileges {
+  field_security?: SecurityFieldSecurity[]
+  names: Indices
+  privileges: SecurityIndexPrivilege[]
+  query?: SecurityIndicesPrivilegesQuery[]
+  allow_restricted_indices: boolean
+}
+
 export interface SecurityUserProfile {
   uid: SecurityUserProfileId
   user: SecurityUserProfileUser
@@ -15417,7 +15518,7 @@ export interface SecurityGetUserPrivilegesResponse {
   applications: SecurityApplicationPrivileges[]
   cluster: string[]
   global: SecurityGlobalPrivilege[]
-  indices: SecurityIndicesPrivileges[]
+  indices: SecurityUserIndicesPrivileges[]
   run_as: string[]
 }
 
@@ -15791,7 +15892,7 @@ export type ShutdownPutNodeResponse = AcknowledgedResponseBase
 
 export interface SlmConfiguration {
   ignore_unavailable?: boolean
-  indices: Indices
+  indices?: Indices
   include_global_state?: boolean
   feature_states?: string[]
   metadata?: Metadata
@@ -15811,10 +15912,10 @@ export interface SlmInvocation {
 }
 
 export interface SlmPolicy {
-  config: SlmConfiguration
+  config?: SlmConfiguration
   name: Name
   repository: string
-  retention: SlmRetention
+  retention?: SlmRetention
   schedule: WatcherCronExpression
 }
 
@@ -16308,6 +16409,7 @@ export interface SslCertificatesCertificateInformation {
   expiry: DateTime
   format: string
   has_private_key: boolean
+  issuer?: string
   path: string
   serial_number: string
   subject_dn: string
@@ -16513,6 +16615,7 @@ export interface TransformSettings {
   deduce_mappings?: boolean
   docs_per_second?: float
   max_page_search_size?: integer
+  unattended?: boolean
 }
 
 export interface TransformSource {
@@ -17486,14 +17589,6 @@ export interface XpackInfoResponse {
   tagline: string
 }
 
-export interface XpackUsageAllJobs {
-  count: integer
-  detectors: Record<string, integer>
-  created_by: Record<string, string | integer>
-  model_size: Record<string, integer>
-  forecasts: Record<string, integer>
-}
-
 export interface XpackUsageAnalytics extends XpackUsageBase {
   stats: XpackUsageAnalyticsStatistics
 }
@@ -17635,15 +17730,17 @@ export interface XpackUsageIpFilter {
   transport: boolean
 }
 
-export interface XpackUsageJobsKeys {
-  _all?: XpackUsageAllJobs
+export interface XpackUsageJobUsage {
+  count: integer
+  created_by: Record<string, long>
+  detectors: MlJobStatistics
+  forecasts: XpackUsageMlJobForecasts
+  model_size: MlJobStatistics
 }
-export type XpackUsageJobs = XpackUsageJobsKeys
-& { [property: string]: MlJob | XpackUsageAllJobs }
 
 export interface XpackUsageMachineLearning extends XpackUsageBase {
   datafeeds: Record<string, XpackUsageDatafeed>
-  jobs: XpackUsageJobs
+  jobs: Record<string, XpackUsageJobUsage>
   node_count: integer
   data_frame_analytics_jobs: XpackUsageMlDataFrameAnalyticsJobs
   inference: XpackUsageMlInference
@@ -17716,11 +17813,17 @@ export interface XpackUsageMlInferenceTrainedModelsCount {
   total: long
   prepackaged: long
   other: long
+  pass_through?: long
   regression?: long
   classification?: long
   ner?: long
 }
 
+export interface XpackUsageMlJobForecasts {
+  total: long
+  forecasted_jobs: long
+}
+
 export interface XpackUsageMonitoring extends XpackUsageBase {
   collection_enabled: boolean
   enabled_exporters: Record<string, long>
diff --git a/src/api/typesWithBodyKey.ts b/src/api/typesWithBodyKey.ts
index 98c43c1d1..6e59a06f8 100644
--- a/src/api/typesWithBodyKey.ts
+++ b/src/api/typesWithBodyKey.ts
@@ -254,7 +254,7 @@ export interface DeleteByQueryResponse {
 }
 
 export interface DeleteByQueryRethrottleRequest extends RequestBase {
-  task_id: Id
+  task_id: TaskId
   requests_per_second?: float
 }
 
@@ -361,13 +361,13 @@ export interface FieldCapsRequest extends RequestBase {
   index?: Indices
   allow_no_indices?: boolean
   expand_wildcards?: ExpandWildcards
-  fields: Fields
   ignore_unavailable?: boolean
   include_unmapped?: boolean
   filters?: string
   types?: string[]
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
   body?: {
+    fields?: Fields
     index_filter?: QueryDslQueryContainer
     runtime_mappings?: MappingRuntimeFields
   }
@@ -1145,12 +1145,14 @@ export interface SearchAggregationProfileDebug {
   filters?: SearchAggregationProfileDelegateDebugFilter[]
   segments_counted?: integer
   segments_collected?: integer
+  map_reducer?: string
 }
 
 export interface SearchAggregationProfileDelegateDebugFilter {
   results_from_metadata?: integer
   query?: string
   specialized_for?: string
+  segments_counted_in_constant_time?: integer
 }
 
 export type SearchBoundaryScanner = 'chars' | 'sentence' | 'word'
@@ -1221,6 +1223,8 @@ export interface SearchFetchProfile {
 }
 
 export interface SearchFetchProfileBreakdown {
+  load_source?: integer
+  load_source_count?: integer
   load_stored_fields?: integer
   load_stored_fields_count?: integer
   next_reader?: integer
@@ -1282,6 +1286,7 @@ export interface SearchHighlightBase {
 export interface SearchHighlightField extends SearchHighlightBase {
   fragment_offset?: integer
   matched_fields?: Fields
+  analyzer?: AnalysisAnalyzer
 }
 
 export type SearchHighlighterEncoder = 'default' | 'html'
@@ -1383,8 +1388,9 @@ export interface SearchPhraseSuggestHighlight {
 
 export interface SearchPhraseSuggestOption {
   text: string
-  highlighted: string
   score: double
+  highlighted?: string
+  collate_match?: boolean
 }
 
 export interface SearchPhraseSuggester extends SearchSuggesterBase {
@@ -1527,8 +1533,10 @@ export interface SearchTermSuggest extends SearchSuggestBase {
 
 export interface SearchTermSuggestOption {
   text: string
-  freq: long
   score: double
+  freq: long
+  highlighted?: string
+  collate_match?: boolean
 }
 
 export interface SearchTermSuggester extends SearchSuggesterBase {
@@ -1993,7 +2001,7 @@ export interface FieldSort {
 
 export type FieldSortNumericType = 'long' | 'double' | 'date' | 'date_nanos'
 
-export type FieldValue = long | double | string | boolean | any
+export type FieldValue = long | double | string | boolean | null | any
 
 export interface FielddataStats {
   evictions?: long
@@ -2035,6 +2043,8 @@ export interface GeoHashLocation {
 
 export type GeoHashPrecision = number | string
 
+export type GeoHexCell = string
+
 export interface GeoLine {
   type: string
   coordinates: double[][]
@@ -2197,10 +2207,11 @@ export interface NestedSortValue {
 export interface NodeAttributes {
   attributes: Record<string, string>
   ephemeral_id: Id
-  id?: Id
+  id?: NodeId
   name: NodeName
   transport_address: TransportAddress
   roles?: NodeRoles
+  external_id: string
 }
 
 export type NodeId = string
@@ -2333,7 +2344,7 @@ export interface ScriptSort {
   nested?: NestedSortValue
 }
 
-export type ScriptSortType = 'string' | 'number'
+export type ScriptSortType = 'string' | 'number' | 'version'
 
 export interface ScriptTransform {
   lang?: string
@@ -2427,7 +2438,7 @@ export interface ShardsOperationResponseBase {
 
 export interface SlicedScroll {
   field?: Field
-  id: integer
+  id: Id
   max: integer
 }
 
@@ -2452,7 +2463,7 @@ export type SortOptions = SortOptionsKeys
 
 export type SortOrder = 'asc' | 'desc'
 
-export type SortResults = (long | double | string | null)[]
+export type SortResults = FieldValue[]
 
 export interface StoreStats {
   size?: ByteSize
@@ -2592,11 +2603,12 @@ export interface AggregationsAdjacencyMatrixAggregation extends AggregationsBuck
 }
 
 export interface AggregationsAdjacencyMatrixBucketKeys extends AggregationsMultiBucketBase {
+  key: string
 }
 export type AggregationsAdjacencyMatrixBucket = AggregationsAdjacencyMatrixBucketKeys
-& { [property: string]: AggregationsAggregate | long }
+& { [property: string]: AggregationsAggregate | string | long }
 
-export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsChildrenAggregate | AggregationsParentAggregate | AggregationsSamplerAggregate | AggregationsUnmappedSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsGeoLineAggregate
+export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsChildrenAggregate | AggregationsParentAggregate | AggregationsSamplerAggregate | AggregationsUnmappedSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsGeoHexGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsIpPrefixAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsGeoLineAggregate
 
 export interface AggregationsAggregateBase {
   meta?: Metadata
@@ -2647,6 +2659,7 @@ export interface AggregationsAggregationContainer {
   global?: AggregationsGlobalAggregation
   histogram?: AggregationsHistogramAggregation
   ip_range?: AggregationsIpRangeAggregation
+  ip_prefix?: AggregationsIpPrefixAggregation
   inference?: AggregationsInferenceAggregation
   line?: AggregationsGeoLineAggregation
   matrix_stats?: AggregationsMatrixStatsAggregation
@@ -2845,11 +2858,13 @@ export interface AggregationsChildrenAggregation extends AggregationsBucketAggre
 }
 
 export interface AggregationsCompositeAggregate extends AggregationsMultiBucketAggregateBase<AggregationsCompositeBucket> {
-  after_key?: Record<string, any>
+  after_key?: AggregationsCompositeAggregateKey
 }
 
+export type AggregationsCompositeAggregateKey = Record<Field, FieldValue>
+
 export interface AggregationsCompositeAggregation extends AggregationsBucketAggregationBase {
-  after?: Record<string, string | float | null>
+  after?: AggregationsCompositeAggregateKey
   size?: integer
   sources?: Record<string, AggregationsCompositeAggregationSource>[]
 }
@@ -2862,10 +2877,10 @@ export interface AggregationsCompositeAggregationSource {
 }
 
 export interface AggregationsCompositeBucketKeys extends AggregationsMultiBucketBase {
-  key: Record<string, any>
+  key: AggregationsCompositeAggregateKey
 }
 export type AggregationsCompositeBucket = AggregationsCompositeBucketKeys
-& { [property: string]: AggregationsAggregate | Record<string, any> | long }
+& { [property: string]: AggregationsAggregate | AggregationsCompositeAggregateKey | long }
 
 export interface AggregationsCumulativeCardinalityAggregate extends AggregationsAggregateBase {
   value: long
@@ -2976,6 +2991,8 @@ export interface AggregationsExtendedStatsAggregate extends AggregationsStatsAgg
   variance_population: double | null
   variance_sampling: double | null
   std_deviation: double | null
+  std_deviation_population: double | null
+  std_deviation_sampling: double | null
   std_deviation_bounds?: AggregationsStandardDeviationBounds
   sum_of_squares_as_string?: string
   variance_as_string?: string
@@ -3026,7 +3043,7 @@ export interface AggregationsFormattableMetricAggregation extends AggregationsMe
   format?: string
 }
 
-export type AggregationsGapPolicy = 'skip' | 'insert_zeros'
+export type AggregationsGapPolicy = 'skip' | 'insert_zeros' | 'keep_values'
 
 export interface AggregationsGeoBoundsAggregate extends AggregationsAggregateBase {
   bounds?: GeoBounds
@@ -3074,9 +3091,19 @@ export interface AggregationsGeoHashGridBucketKeys extends AggregationsMultiBuck
 export type AggregationsGeoHashGridBucket = AggregationsGeoHashGridBucketKeys
 & { [property: string]: AggregationsAggregate | GeoHash | long }
 
+export interface AggregationsGeoHexGridAggregate extends AggregationsMultiBucketAggregateBase<AggregationsGeoHexGridBucket> {
+}
+
+export interface AggregationsGeoHexGridBucketKeys extends AggregationsMultiBucketBase {
+  key: GeoHexCell
+}
+export type AggregationsGeoHexGridBucket = AggregationsGeoHexGridBucketKeys
+& { [property: string]: AggregationsAggregate | GeoHexCell | long }
+
 export interface AggregationsGeoLineAggregate extends AggregationsAggregateBase {
   type: string
   geometry: GeoLine
+  properties: any
 }
 
 export interface AggregationsGeoLineAggregation {
@@ -3228,6 +3255,27 @@ export interface AggregationsInferenceTopClassEntry {
   class_score: double
 }
 
+export interface AggregationsIpPrefixAggregate extends AggregationsMultiBucketAggregateBase<AggregationsIpPrefixBucket> {
+}
+
+export interface AggregationsIpPrefixAggregation extends AggregationsBucketAggregationBase {
+  field: Field
+  prefix_length: integer
+  is_ipv6?: boolean
+  append_prefix_length?: boolean
+  keyed?: boolean
+  min_doc_count?: long
+}
+
+export interface AggregationsIpPrefixBucketKeys extends AggregationsMultiBucketBase {
+  is_ipv6: boolean
+  key: string
+  prefix_length: integer
+  netmask?: string
+}
+export type AggregationsIpPrefixBucket = AggregationsIpPrefixBucketKeys
+& { [property: string]: AggregationsAggregate | boolean | string | integer | long }
+
 export interface AggregationsIpRangeAggregate extends AggregationsMultiBucketAggregateBase<AggregationsIpRangeBucket> {
 }
 
@@ -3243,6 +3291,7 @@ export interface AggregationsIpRangeAggregationRange {
 }
 
 export interface AggregationsIpRangeBucketKeys extends AggregationsMultiBucketBase {
+  key?: string
   from?: string
   to?: string
 }
@@ -3395,12 +3444,12 @@ export interface AggregationsMultiTermsAggregation extends AggregationsBucketAgg
 }
 
 export interface AggregationsMultiTermsBucketKeys extends AggregationsMultiBucketBase {
-  key: (long | double | string)[]
+  key: FieldValue[]
   key_as_string?: string
   doc_count_error_upper_bound?: long
 }
 export type AggregationsMultiTermsBucket = AggregationsMultiTermsBucketKeys
-& { [property: string]: AggregationsAggregate | (long | double | string)[] | string | long }
+& { [property: string]: AggregationsAggregate | FieldValue[] | string | long }
 
 export interface AggregationsMutualInformationHeuristic {
   background_is_superset?: boolean
@@ -3550,7 +3599,7 @@ export interface AggregationsSerialDifferencingAggregation extends AggregationsP
   lag?: integer
 }
 
-export interface AggregationsSignificantLongTermsAggregate extends AggregationsMultiBucketAggregateBase<AggregationsSignificantLongTermsBucket> {
+export interface AggregationsSignificantLongTermsAggregate extends AggregationsSignificantTermsAggregateBase<AggregationsSignificantLongTermsBucket> {
 }
 
 export interface AggregationsSignificantLongTermsBucketKeys extends AggregationsSignificantTermsBucketBase {
@@ -3560,7 +3609,7 @@ export interface AggregationsSignificantLongTermsBucketKeys extends Aggregations
 export type AggregationsSignificantLongTermsBucket = AggregationsSignificantLongTermsBucketKeys
 & { [property: string]: AggregationsAggregate | long | string | double }
 
-export interface AggregationsSignificantStringTermsAggregate extends AggregationsMultiBucketAggregateBase<AggregationsSignificantStringTermsBucket> {
+export interface AggregationsSignificantStringTermsAggregate extends AggregationsSignificantTermsAggregateBase<AggregationsSignificantStringTermsBucket> {
 }
 
 export interface AggregationsSignificantStringTermsBucketKeys extends AggregationsSignificantTermsBucketBase {
@@ -3569,6 +3618,11 @@ export interface AggregationsSignificantStringTermsBucketKeys extends Aggregatio
 export type AggregationsSignificantStringTermsBucket = AggregationsSignificantStringTermsBucketKeys
 & { [property: string]: AggregationsAggregate | string | double | long }
 
+export interface AggregationsSignificantTermsAggregateBase<T = unknown> extends AggregationsMultiBucketAggregateBase<T> {
+  bg_count?: long
+  doc_count?: long
+}
+
 export interface AggregationsSignificantTermsAggregation extends AggregationsBucketAggregationBase {
   background_filter?: QueryDslQueryContainer
   chi_square?: AggregationsChiSquareHeuristic
@@ -3697,10 +3751,10 @@ export interface AggregationsStringTermsAggregate extends AggregationsTermsAggre
 }
 
 export interface AggregationsStringTermsBucketKeys extends AggregationsTermsBucketBase {
-  key: string
+  key: FieldValue
 }
 export type AggregationsStringTermsBucket = AggregationsStringTermsBucketKeys
-& { [property: string]: AggregationsAggregate | string | long }
+& { [property: string]: AggregationsAggregate | FieldValue | long }
 
 export interface AggregationsSumAggregate extends AggregationsSingleMetricAggregateBase {
 }
@@ -3736,7 +3790,7 @@ export type AggregationsTTestType = 'paired' | 'homoscedastic' | 'heteroscedasti
 
 export interface AggregationsTermsAggregateBase<TBucket = unknown> extends AggregationsMultiBucketAggregateBase<TBucket> {
   doc_count_error_upper_bound?: long
-  sum_other_doc_count: long
+  sum_other_doc_count?: long
 }
 
 export interface AggregationsTermsAggregation extends AggregationsBucketAggregationBase {
@@ -3827,7 +3881,7 @@ export interface AggregationsUnmappedSamplerAggregateKeys extends AggregationsSi
 export type AggregationsUnmappedSamplerAggregate = AggregationsUnmappedSamplerAggregateKeys
 & { [property: string]: AggregationsAggregate | long | Metadata }
 
-export interface AggregationsUnmappedSignificantTermsAggregate extends AggregationsMultiBucketAggregateBase<void> {
+export interface AggregationsUnmappedSignificantTermsAggregate extends AggregationsSignificantTermsAggregateBase<void> {
 }
 
 export interface AggregationsUnmappedTermsAggregate extends AggregationsTermsAggregateBase<void> {
@@ -4508,6 +4562,7 @@ export interface MappingAggregateMetricDoubleProperty extends MappingPropertyBas
   type: 'aggregate_metric_double'
   default_metric: string
   metrics: string[]
+  time_series_metric?: MappingTimeSeriesMetricType
 }
 
 export interface MappingAllField {
@@ -4535,7 +4590,7 @@ export interface MappingBooleanProperty extends MappingDocValuesPropertyBase {
   type: 'boolean'
 }
 
-export interface MappingByteNumberProperty extends MappingStandardNumberProperty {
+export interface MappingByteNumberProperty extends MappingNumberPropertyBase {
   type: 'byte'
   null_value?: byte
 }
@@ -4610,7 +4665,7 @@ export interface MappingDocValuesPropertyBase extends MappingCorePropertyBase {
   doc_values?: boolean
 }
 
-export interface MappingDoubleNumberProperty extends MappingStandardNumberProperty {
+export interface MappingDoubleNumberProperty extends MappingNumberPropertyBase {
   type: 'double'
   null_value?: double
 }
@@ -4686,7 +4741,7 @@ export interface MappingFlattenedProperty extends MappingPropertyBase {
   type: 'flattened'
 }
 
-export interface MappingFloatNumberProperty extends MappingStandardNumberProperty {
+export interface MappingFloatNumberProperty extends MappingNumberPropertyBase {
   type: 'float'
   null_value?: float
 }
@@ -4715,7 +4770,7 @@ export interface MappingGeoShapeProperty extends MappingDocValuesPropertyBase {
 
 export type MappingGeoStrategy = 'recursive' | 'term'
 
-export interface MappingHalfFloatNumberProperty extends MappingStandardNumberProperty {
+export interface MappingHalfFloatNumberProperty extends MappingNumberPropertyBase {
   type: 'half_float'
   null_value?: float
 }
@@ -4731,7 +4786,7 @@ export interface MappingIndexField {
 
 export type MappingIndexOptions = 'docs' | 'freqs' | 'positions' | 'offsets'
 
-export interface MappingIntegerNumberProperty extends MappingStandardNumberProperty {
+export interface MappingIntegerNumberProperty extends MappingNumberPropertyBase {
   type: 'integer'
   null_value?: integer
 }
@@ -4743,8 +4798,11 @@ export interface MappingIntegerRangeProperty extends MappingRangePropertyBase {
 export interface MappingIpProperty extends MappingDocValuesPropertyBase {
   boost?: double
   index?: boolean
-  null_value?: string
   ignore_malformed?: boolean
+  null_value?: string
+  on_script_error?: MappingOnScriptError
+  script?: Script
+  time_series_dimension?: boolean
   type: 'ip'
 }
 
@@ -4754,6 +4812,7 @@ export interface MappingIpRangeProperty extends MappingRangePropertyBase {
 
 export interface MappingJoinProperty extends MappingPropertyBase {
   relations?: Record<RelationName, RelationName | RelationName[]>
+  eager_global_ordinals?: boolean
   type: 'join'
 }
 
@@ -4770,7 +4829,7 @@ export interface MappingKeywordProperty extends MappingDocValuesPropertyBase {
   type: 'keyword'
 }
 
-export interface MappingLongNumberProperty extends MappingStandardNumberProperty {
+export interface MappingLongNumberProperty extends MappingNumberPropertyBase {
   type: 'long'
   null_value?: long
 }
@@ -4800,9 +4859,14 @@ export interface MappingNestedProperty extends MappingCorePropertyBase {
 }
 
 export interface MappingNumberPropertyBase extends MappingDocValuesPropertyBase {
-  index?: boolean
+  boost?: double
+  coerce?: boolean
   ignore_malformed?: boolean
+  index?: boolean
+  on_script_error?: MappingOnScriptError
+  script?: Script
   time_series_metric?: MappingTimeSeriesMetricType
+  time_series_dimension?: boolean
 }
 
 export interface MappingObjectProperty extends MappingCorePropertyBase {
@@ -4865,7 +4929,6 @@ export type MappingRuntimeFields = Record<Field, MappingRuntimeField>
 
 export interface MappingScaledFloatNumberProperty extends MappingNumberPropertyBase {
   type: 'scaled_float'
-  coerce?: boolean
   null_value?: double
   scaling_factor?: double
 }
@@ -4890,7 +4953,7 @@ export interface MappingShapeProperty extends MappingDocValuesPropertyBase {
   type: 'shape'
 }
 
-export interface MappingShortNumberProperty extends MappingStandardNumberProperty {
+export interface MappingShortNumberProperty extends MappingNumberPropertyBase {
   type: 'short'
   null_value?: short
 }
@@ -4905,13 +4968,10 @@ export interface MappingSourceField {
   enabled?: boolean
   excludes?: string[]
   includes?: string[]
+  mode?: MappingSourceFieldMode
 }
 
-export interface MappingStandardNumberProperty extends MappingNumberPropertyBase {
-  coerce?: boolean
-  script?: Script
-  on_script_error?: MappingOnScriptError
-}
+export type MappingSourceFieldMode = 'disabled' | 'stored' | 'synthetic'
 
 export interface MappingSuggestContext {
   name: Name
@@ -8659,22 +8719,19 @@ export interface DanglingIndicesListDanglingIndicesResponse {
   dangling_indices: DanglingIndicesListDanglingIndicesDanglingIndex[]
 }
 
-export interface EnrichConfiguration {
-  geo_match?: EnrichPolicy
-  match: EnrichPolicy
-  range: EnrichPolicy
-}
-
 export interface EnrichPolicy {
   enrich_fields: Fields
   indices: Indices
   match_field: Field
   query?: string
   name?: Name
+  elasticsearch_version?: string
 }
 
+export type EnrichPolicyType = 'geo_match' | 'match' | 'range'
+
 export interface EnrichSummary {
-  config: EnrichConfiguration
+  config: Partial<Record<EnrichPolicyType, EnrichPolicy>>
 }
 
 export interface EnrichDeletePolicyRequest extends RequestBase {
@@ -9282,6 +9339,10 @@ export interface IndicesDataStreamVisibility {
   hidden?: boolean
 }
 
+export interface IndicesDownsampleConfig {
+  fixed_interval: DurationLarge
+}
+
 export interface IndicesFielddataFrequencyFilter {
   max: double
   min: double
@@ -9458,6 +9519,7 @@ export interface IndicesIndexTemplateSummary {
 
 export interface IndicesIndexVersioning {
   created?: VersionString
+  created_string?: string
 }
 
 export interface IndicesIndexingPressure {
@@ -9469,6 +9531,7 @@ export interface IndicesIndexingPressureMemory {
 }
 
 export interface IndicesMappingLimitSettings {
+  coerce?: boolean
   total_fields?: IndicesMappingLimitSettingsTotalFields
   depth?: IndicesMappingLimitSettingsDepth
   nested_fields?: IndicesMappingLimitSettingsNestedFields
@@ -9563,7 +9626,7 @@ export interface IndicesSettingsSimilarity {
 }
 
 export interface IndicesSettingsSimilarityBm25 {
-  b: integer
+  b: double
   discount_overlaps: boolean
   k1: double
   type: 'BM25'
@@ -9912,7 +9975,7 @@ export interface IndicesDownsampleRequest extends RequestBase {
   index: IndexName
   target_index: IndexName
   /** @deprecated The use of the 'body' key has been deprecated, use 'config' instead. */
-  body?: any
+  body?: IndicesDownsampleConfig
 }
 
 export type IndicesDownsampleResponse = any
@@ -10034,7 +10097,11 @@ export interface IndicesForcemergeRequest extends RequestBase {
   wait_for_completion?: boolean
 }
 
-export type IndicesForcemergeResponse = ShardsOperationResponseBase
+export type IndicesForcemergeResponse = IndicesForcemergeForceMergeResponseBody
+
+export interface IndicesForcemergeForceMergeResponseBody extends ShardsOperationResponseBase {
+  task?: string
+}
 
 export type IndicesGetFeature = 'aliases' | 'mappings' | 'settings'
 
@@ -10485,13 +10552,18 @@ export interface IndicesRolloverResponse {
 }
 
 export interface IndicesRolloverRolloverConditions {
+  min_age?: Duration
   max_age?: Duration
   max_age_millis?: DurationValue<UnitMillis>
+  min_docs?: long
   max_docs?: long
-  max_size?: string
+  max_size?: ByteSize
+  min_size?: ByteSize
   max_size_bytes?: ByteSize
   max_primary_shard_size?: ByteSize
-  max_primary_shard_size_bytes?: ByteSize
+  min_primary_shard_size?: ByteSize
+  max_primary_shard_docs?: long
+  min_primary_shard_docs?: long
 }
 
 export interface IndicesSegmentsIndexSegment {
@@ -10923,39 +10995,38 @@ export interface IngestBytesProcessor extends IngestProcessorBase {
 export interface IngestCircleProcessor extends IngestProcessorBase {
   error_distance: double
   field: Field
-  ignore_missing: boolean
+  ignore_missing?: boolean
   shape_type: IngestShapeType
-  target_field: Field
+  target_field?: Field
 }
 
 export interface IngestConvertProcessor extends IngestProcessorBase {
   field: Field
   ignore_missing?: boolean
-  target_field: Field
+  target_field?: Field
   type: IngestConvertType
 }
 
 export type IngestConvertType = 'integer' | 'long' | 'float' | 'double' | 'string' | 'boolean' | 'auto'
 
 export interface IngestCsvProcessor extends IngestProcessorBase {
-  empty_value: any
-  description?: string
+  empty_value?: any
   field: Field
   ignore_missing?: boolean
   quote?: string
   separator?: string
   target_fields: Fields
-  trim: boolean
+  trim?: boolean
 }
 
 export interface IngestDateIndexNameProcessor extends IngestProcessorBase {
   date_formats: string[]
   date_rounding: string
   field: Field
-  index_name_format: string
-  index_name_prefix: string
-  locale: string
-  timezone: string
+  index_name_format?: string
+  index_name_prefix?: string
+  locale?: string
+  timezone?: string
 }
 
 export interface IngestDateProcessor extends IngestProcessorBase {
@@ -10967,9 +11038,9 @@ export interface IngestDateProcessor extends IngestProcessorBase {
 }
 
 export interface IngestDissectProcessor extends IngestProcessorBase {
-  append_separator: string
+  append_separator?: string
   field: Field
-  ignore_missing: boolean
+  ignore_missing?: boolean
   pattern: string
 }
 
@@ -11002,18 +11073,18 @@ export interface IngestForeachProcessor extends IngestProcessorBase {
 }
 
 export interface IngestGeoIpProcessor extends IngestProcessorBase {
-  database_file: string
+  database_file?: string
   field: Field
-  first_only: boolean
-  ignore_missing: boolean
-  properties: string[]
-  target_field: Field
+  first_only?: boolean
+  ignore_missing?: boolean
+  properties?: string[]
+  target_field?: Field
 }
 
 export interface IngestGrokProcessor extends IngestProcessorBase {
   field: Field
   ignore_missing?: boolean
-  pattern_definitions: Record<string, string>
+  pattern_definitions?: Record<string, string>
   patterns: string[]
   trace_match?: boolean
 }
@@ -11046,7 +11117,7 @@ export interface IngestInferenceConfigRegression {
 
 export interface IngestInferenceProcessor extends IngestProcessorBase {
   model_id: Id
-  target_field: Field
+  target_field?: Field
   field_map?: Record<Field, any>
   inference_config?: IngestInferenceConfig
 }
@@ -11058,11 +11129,15 @@ export interface IngestJoinProcessor extends IngestProcessorBase {
 }
 
 export interface IngestJsonProcessor extends IngestProcessorBase {
-  add_to_root: boolean
+  add_to_root?: boolean
+  add_to_root_conflict_strategy?: IngestJsonProcessorConflictStrategy
+  allow_duplicate_keys?: boolean
   field: Field
-  target_field: Field
+  target_field?: Field
 }
 
+export type IngestJsonProcessorConflictStrategy = 'replace' | 'merge'
+
 export interface IngestKeyValueProcessor extends IngestProcessorBase {
   exclude_keys?: string[]
   field: Field
@@ -11098,9 +11173,11 @@ export interface IngestPipelineConfig {
 
 export interface IngestPipelineProcessor extends IngestProcessorBase {
   name: Name
+  ignore_missing_pipeline?: boolean
 }
 
 export interface IngestProcessorBase {
+  description?: string
   if?: string
   ignore_failure?: boolean
   on_failure?: IngestProcessorContainer[]
@@ -11156,9 +11233,12 @@ export interface IngestRenameProcessor extends IngestProcessorBase {
 }
 
 export interface IngestSetProcessor extends IngestProcessorBase {
+  copy_from?: Field
   field: Field
+  ignore_empty_value?: boolean
+  media_type?: string
   override?: boolean
-  value: any
+  value?: any
 }
 
 export interface IngestSetSecurityUserProcessor extends IngestProcessorBase {
@@ -11170,8 +11250,8 @@ export type IngestShapeType = 'geo_shape' | 'shape'
 
 export interface IngestSortProcessor extends IngestProcessorBase {
   field: Field
-  order: SortOrder
-  target_field: Field
+  order?: SortOrder
+  target_field?: Field
 }
 
 export interface IngestSplitProcessor extends IngestProcessorBase {
@@ -11202,10 +11282,10 @@ export interface IngestUrlDecodeProcessor extends IngestProcessorBase {
 
 export interface IngestUserAgentProcessor extends IngestProcessorBase {
   field: Field
-  ignore_missing: boolean
-  options: IngestUserAgentProperty[]
-  regex_file: string
-  target_field: Field
+  ignore_missing?: boolean
+  options?: IngestUserAgentProperty[]
+  regex_file?: string
+  target_field?: Field
 }
 
 export type IngestUserAgentProperty = 'NAME' | 'MAJOR' | 'MINOR' | 'PATCH' | 'OS' | 'OS_NAME' | 'OS_MAJOR' | 'OS_MINOR' | 'DEVICE' | 'BUILD'
@@ -11281,14 +11361,17 @@ export interface IngestSimulateDocument {
   _source: any
 }
 
-export interface IngestSimulateDocumentSimulation {
+export interface IngestSimulateDocumentSimulationKeys {
   _id: Id
   _index: IndexName
   _ingest: IngestSimulateIngest
-  _parent?: string
   _routing?: string
   _source: Record<string, any>
+  _version?: SpecUtilsStringified<VersionNumber>
+  _version_type?: VersionType
 }
+export type IngestSimulateDocumentSimulation = IngestSimulateDocumentSimulationKeys
+& { [property: string]: string | Id | IndexName | IngestSimulateIngest | Record<string, any> | SpecUtilsStringified<VersionNumber> | VersionType }
 
 export interface IngestSimulateIngest {
   timestamp: DateTime
@@ -11387,7 +11470,7 @@ export interface LicensePostRequest extends RequestBase {
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
   body?: {
     license?: LicenseLicense
-    licenses: LicenseLicense[]
+    licenses?: LicenseLicense[]
   }
 }
 
@@ -12691,6 +12774,14 @@ export interface MlZeroShotClassificationInferenceUpdateOptions {
   labels: string[]
 }
 
+export interface MlClearTrainedModelDeploymentCacheRequest extends RequestBase {
+  model_id?: Id
+}
+
+export interface MlClearTrainedModelDeploymentCacheResponse {
+  cleared: boolean
+}
+
 export interface MlCloseJobRequest extends RequestBase {
   job_id: Id
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
@@ -15215,7 +15306,7 @@ export interface SecurityFieldRule {
 
 export interface SecurityFieldSecurity {
   except?: Fields
-  grant: Fields
+  grant?: Fields
 }
 
 export interface SecurityGlobalPrivilege {
@@ -15286,17 +15377,19 @@ export interface SecurityRoleMappingRule {
   except?: SecurityRoleMappingRule
 }
 
+export type SecurityRoleTemplateInlineQuery = string | QueryDslQueryContainer
+
 export interface SecurityRoleTemplateInlineScript extends ScriptBase {
   lang?: ScriptLanguage
   options?: Record<string, string>
-  source: string | QueryDslQueryContainer
+  source: SecurityRoleTemplateInlineQuery
 }
 
 export interface SecurityRoleTemplateQuery {
   template?: SecurityRoleTemplateScript
 }
 
-export type SecurityRoleTemplateScript = SecurityRoleTemplateInlineScript | string | QueryDslQueryContainer | StoredScriptId
+export type SecurityRoleTemplateScript = SecurityRoleTemplateInlineScript | SecurityRoleTemplateInlineQuery | StoredScriptId
 
 export interface SecurityTransientMetadataConfig {
   enabled: boolean
@@ -15312,6 +15405,14 @@ export interface SecurityUser {
   profile_uid?: SecurityUserProfileId
 }
 
+export interface SecurityUserIndicesPrivileges {
+  field_security?: SecurityFieldSecurity[]
+  names: Indices
+  privileges: SecurityIndexPrivilege[]
+  query?: SecurityIndicesPrivilegesQuery[]
+  allow_restricted_indices: boolean
+}
+
 export interface SecurityUserProfile {
   uid: SecurityUserProfileId
   user: SecurityUserProfileUser
@@ -15730,7 +15831,7 @@ export interface SecurityGetUserPrivilegesResponse {
   applications: SecurityApplicationPrivileges[]
   cluster: string[]
   global: SecurityGlobalPrivilege[]
-  indices: SecurityIndicesPrivileges[]
+  indices: SecurityUserIndicesPrivileges[]
   run_as: string[]
 }
 
@@ -16160,7 +16261,7 @@ export type ShutdownPutNodeResponse = AcknowledgedResponseBase
 
 export interface SlmConfiguration {
   ignore_unavailable?: boolean
-  indices: Indices
+  indices?: Indices
   include_global_state?: boolean
   feature_states?: string[]
   metadata?: Metadata
@@ -16180,10 +16281,10 @@ export interface SlmInvocation {
 }
 
 export interface SlmPolicy {
-  config: SlmConfiguration
+  config?: SlmConfiguration
   name: Name
   repository: string
-  retention: SlmRetention
+  retention?: SlmRetention
   schedule: WatcherCronExpression
 }
 
@@ -16701,6 +16802,7 @@ export interface SslCertificatesCertificateInformation {
   expiry: DateTime
   format: string
   has_private_key: boolean
+  issuer?: string
   path: string
   serial_number: string
   subject_dn: string
@@ -16907,6 +17009,7 @@ export interface TransformSettings {
   deduce_mappings?: boolean
   docs_per_second?: float
   max_page_search_size?: integer
+  unattended?: boolean
 }
 
 export interface TransformSource {
@@ -17898,14 +18001,6 @@ export interface XpackInfoResponse {
   tagline: string
 }
 
-export interface XpackUsageAllJobs {
-  count: integer
-  detectors: Record<string, integer>
-  created_by: Record<string, string | integer>
-  model_size: Record<string, integer>
-  forecasts: Record<string, integer>
-}
-
 export interface XpackUsageAnalytics extends XpackUsageBase {
   stats: XpackUsageAnalyticsStatistics
 }
@@ -18047,15 +18142,17 @@ export interface XpackUsageIpFilter {
   transport: boolean
 }
 
-export interface XpackUsageJobsKeys {
-  _all?: XpackUsageAllJobs
+export interface XpackUsageJobUsage {
+  count: integer
+  created_by: Record<string, long>
+  detectors: MlJobStatistics
+  forecasts: XpackUsageMlJobForecasts
+  model_size: MlJobStatistics
 }
-export type XpackUsageJobs = XpackUsageJobsKeys
-& { [property: string]: MlJob | XpackUsageAllJobs }
 
 export interface XpackUsageMachineLearning extends XpackUsageBase {
   datafeeds: Record<string, XpackUsageDatafeed>
-  jobs: XpackUsageJobs
+  jobs: Record<string, XpackUsageJobUsage>
   node_count: integer
   data_frame_analytics_jobs: XpackUsageMlDataFrameAnalyticsJobs
   inference: XpackUsageMlInference
@@ -18128,11 +18225,17 @@ export interface XpackUsageMlInferenceTrainedModelsCount {
   total: long
   prepackaged: long
   other: long
+  pass_through?: long
   regression?: long
   classification?: long
   ner?: long
 }
 
+export interface XpackUsageMlJobForecasts {
+  total: long
+  forecasted_jobs: long
+}
+
 export interface XpackUsageMonitoring extends XpackUsageBase {
   collection_enabled: boolean
   enabled_exporters: Record<string, long>