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
}
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import { Duration } from '@_types/Time'
21+
22+
/**
23+
* Data stream failure store contains the configuration of the failure store for a given data stream.
24+
*/
25+
export class DataStreamFailureStore {
26+
/**
27+
* If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store
28+
* that's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will
29+
* not remove any existing data from the failure store.
30+
* @server_default true
31+
*/
32+
enabled?: boolean
33+
/**
34+
* If defined, it specifies the lifecycle configuration for the failure store of this data stream.
35+
*/
36+
lifecycle?: FailureStoreLifecycle
37+
}
38+
39+
/**
40+
* Template equivalent of DataStreamFailureStore that allows nullable values.
41+
*/
42+
export class DataStreamFailureStoreTemplate {
43+
/**
44+
* If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store
45+
* that's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will
46+
* not remove any existing data from the failure store.
47+
* @server_default true
48+
*/
49+
enabled?: boolean | null
50+
/**
51+
* If defined, it specifies the lifecycle configuration for the failure store of this data stream.
52+
*/
53+
lifecycle?: FailureStoreLifecycleTemplate | null
54+
}
55+
56+
/**
57+
* The failure store lifecycle configures the data stream lifecycle configuration for failure indices.
58+
*/
59+
export class FailureStoreLifecycle {
60+
/**
61+
* If defined, every document added to this data stream will be stored at least for this time frame.
62+
* Any time after this duration the document could be deleted.
63+
* When empty, every document in this data stream will be stored indefinitely.
64+
*/
65+
data_retention?: Duration
66+
/**
67+
* If defined, it turns data stream lifecycle on/off (`true`/`false`) for this data stream. A data stream lifecycle
68+
* that's disabled (enabled: `false`) will have no effect on the data stream.
69+
* @server_default true
70+
*/
71+
enabled?: boolean
72+
}
73+
74+
/**
75+
* Template equivalent of FailureStoreLifecycle that allows nullable values.
76+
*/
77+
export class FailureStoreLifecycleTemplate {
78+
/**
79+
* If defined, every document added to this data stream will be stored at least for this time frame.
80+
* Any time after this duration the document could be deleted.
81+
* When empty, every document in this data stream will be stored indefinitely.
82+
*/
83+
data_retention?: Duration | null
84+
/**
85+
* If defined, it turns data stream lifecycle on/off (`true`/`false`) for this data stream. A data stream lifecycle
86+
* that's disabled (enabled: `false`) will have no effect on the data stream.
87+
* @server_default true
88+
*/
89+
enabled?: boolean
90+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import {
21+
DataStreamFailureStore,
22+
DataStreamFailureStoreTemplate
23+
} from '@indices/_types/DataStreamFailureStore'
24+
25+
/**
26+
* Data stream options contain the configuration of data stream level features for a given data stream, for example,
27+
* the failure store configuration.
28+
*/
29+
export class DataStreamOptions {
30+
/**
31+
* If defined, it specifies configuration for the failure store of this data stream.
32+
*/
33+
failure_store?: DataStreamFailureStore
34+
}
35+
36+
/**
37+
* Data stream options template contains the same information as DataStreamOptions but allows them to be set explicitly to null.
38+
*/
39+
export class DataStreamOptionsTemplate {
40+
failure_store?: DataStreamFailureStoreTemplate | null
41+
}

specification/indices/_types/IndexSettings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class RetentionLease {
6969

7070
/**
7171
* @doc_id index-modules-settings
72-
*
72+
* @ext_doc_id index-settings
7373
* @behavior_meta AdditionalProperties fieldname=other_settings description="Additional settings not covered in this type."
7474
*/
7575
export class IndexSettings

specification/indices/_types/IndexTemplate.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919

2020
import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
21+
import { DataStreamOptionsTemplate } from '@indices/_types/DataStreamOptions'
2122
import { Dictionary } from '@spec_utils/Dictionary'
2223
import { IndexName, Metadata, Name, Names, VersionNumber } from '@_types/common'
2324
import { TypeMapping } from '@_types/mapping/TypeMapping'
@@ -115,4 +116,9 @@ export class IndexTemplateSummary {
115116
* @availability serverless stability=stable
116117
*/
117118
lifecycle?: DataStreamLifecycleWithRollover
119+
/**
120+
* @availability stack since=8.19.0 stability=stable
121+
* @availability serverless stability=stable
122+
*/
123+
data_stream_options?: DataStreamOptionsTemplate | null
118124
}

0 commit comments

Comments
 (0)