Skip to content

Commit 2ac1bd3

Browse files
authored
Merge branch 'main' into inference-service-task-types
2 parents e1eb6d5 + ba32be2 commit 2ac1bd3

25 files changed

+2569
-117
lines changed

docs/overlays/elasticsearch-openapi-overlays.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,9 @@ actions:
6060
security:
6161
- apiKeyAuth: []
6262
- basicAuth: []
63-
- bearerAuth: []
63+
- bearerAuth: []
64+
# Abbreviate and annotate items that are not shown in Bump.sh due to depth limits
65+
- target: "$.components['schemas']['_types.aggregations.RandomSamplerAggregation']"
66+
description: Add x-model
67+
update:
68+
x-model: true

docs/overlays/elasticsearch-shared-overlays.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -915,10 +915,6 @@ actions:
915915
description: Add x-model
916916
update:
917917
x-model: true
918-
- target: "$.components['schemas']['_types.aggregations.RandomSamplerAggregation']"
919-
description: Add x-model
920-
update:
921-
x-model: true
922918
- target: "$.components['schemas']['_types.aggregations.RareTermsAggregation']"
923919
description: Add x-model
924920
update:
@@ -1066,6 +1062,16 @@ actions:
10661062
x-model: true
10671063
externalDocs:
10681064
url: https://www.elastic.co/docs/reference/elasticsearch/rest-apis/collapse-search-results
1065+
- target: "$.components['schemas']['indices._types.IndexSettings']"
1066+
description: Add x-model and externalDocs for IndexSettings component
1067+
update:
1068+
x-model: true
1069+
externalDocs:
1070+
description: Index settings
1071+
url: https://www.elastic.co/docs/reference/elasticsearch/index-settings/
1072+
- target: "$.components['schemas']['indices._types.IndexSettings'].properties"
1073+
description: Remove properties IndexSettings object
1074+
remove: true
10691075
# - target: "$.components['schemas']['_global.msearch.MultisearchBody'].properties"
10701076
# description: Add x-model
10711077
# update:
@@ -1082,3 +1088,7 @@ actions:
10821088
- $ref: "../../specification/_global/exists/examples/xCodeSamples/DocumentExistsJavaScriptExample1.yaml"
10831089
- $ref: "../../specification/_global/exists/examples/xCodeSamples/DocumentExistsPythonExample1.yaml"
10841090
- $ref: "../../specification/_global/exists/examples/xCodeSamples/DocumentExistsRubyExample1.yaml"
1091+
# Remove long lists of enum values
1092+
- target: "$.components['schemas']['cat._types.CatAnomalyDetectorColumn'].enum"
1093+
description: Remove enum array
1094+
remove: true

output/openapi/elasticsearch-openapi.json

Lines changed: 360 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/openapi/elasticsearch-serverless-openapi.json

Lines changed: 290 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema-serverless.json

Lines changed: 647 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema.json

Lines changed: 722 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/typescript/types.ts

Lines changed: 67 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/_doc_ids/table.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ index-modules,https://www.elastic.co/docs/reference/elasticsearch/index-settings
282282
index,https://www.elastic.co/docs/get-started
283283
indexing-buffer,https://www.elastic.co/docs/reference/elasticsearch/configuration-reference/indexing-buffer-settings
284284
index-modules-merge,https://www.elastic.co/docs/reference/elasticsearch/index-settings/merge
285+
index-settings,https://www.elastic.co/docs/reference/elasticsearch/index-settings/
285286
index-templates,https://www.elastic.co/docs/manage-data/data-store/templates
286287
index-templates-exist,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-exists-index-template
287288
index-templates-put,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-index-template

specification/_json_spec/indices.get_data_stream_options.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
"default": "open",
3131
"description": "Whether wildcard expressions should get expanded to open or closed indices (default: open)"
3232
},
33-
"include_defaults": {
34-
"type": "boolean",
35-
"description": "Return all relevant default configurations for the data stream (default: false)"
36-
},
3733
"master_timeout": {
3834
"type": "time",
3935
"description": "Specify timeout for connection to master"

specification/cluster/_types/ComponentTemplate.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import { AliasDefinition } from '@indices/_types/AliasDefinition'
2121
import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
22+
import { DataStreamOptionsTemplate } from '@indices/_types/DataStreamOptions'
2223
import { IndexSettings } from '@indices/_types/IndexSettings'
2324
import { Dictionary } from '@spec_utils/Dictionary'
2425
import { IndexName, Metadata, Name, VersionNumber } from '@_types/common'
@@ -52,4 +53,9 @@ export class ComponentTemplateSummary {
5253
* @availability serverless stability=stable
5354
*/
5455
lifecycle?: DataStreamLifecycleWithRollover
56+
/**
57+
* @availability stack since=8.19.0 stability=stable
58+
* @availability serverless stability=stable
59+
*/
60+
data_stream_options?: DataStreamOptionsTemplate | null
5561
}

0 commit comments

Comments
 (0)