Skip to content

Commit f94c0fa

Browse files
authored
Merge branch '8.19' into backport-5096-to-8.19
2 parents 45529f2 + e8eef71 commit f94c0fa

File tree

12 files changed

+52
-14
lines changed

12 files changed

+52
-14
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ The repository has the following structure:
1818
This JSON representation is formally defined by [a set of TypeScript definitions (a meta-model)](./compiler/src/model/metamodel.ts)
1919
that also explains the various properties and their values.
2020

21+
> [!TIP]
22+
> To learn more about how to write docs specifically for our [API references](https://www.elastic.co/docs/api/), refer to the [Contribute to Elastic API docs](https://www.elastic.co/docs/extend/contribute/api-docs/).
2123
2224
## Prepare the environment
2325

@@ -78,6 +80,10 @@ $ make overlay-docs
7880

7981
See [CONTRIBUTING.md](./CONTRIBUTING.md)
8082

83+
Refer to the
84+
[Contribute to Elastic API docs](https://www.elastic.co/docs/extend/contribute/api-docs/)
85+
for more details about the API documentation guidelines.
86+
8187
## Make Targets
8288

8389
```

docs/add-new-api.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ in this repository, or we do have an endpoint definition in [`/specification/_js
55
but we don't have a type definition for it.
66
In this document you will see how to add a new endpopint and how to add a new endpoint definition.
77

8+
> [!TIP]
9+
> To learn more about how to write docs specifically for our [API references](https://www.elastic.co/docs/api/), refer to the [Contribute to Elastic API docs](https://www.elastic.co/docs/extend/contribute/api-docs/).
10+
811
## How to add a new endpoint
912

1013
Add a new endpoint is straightforward, you only need to copy-paste the json rest-api-spec defintion
@@ -56,7 +59,7 @@ Furthermore, every request definition **must** contain three JS Doc tags:
5659
- `stability`: the API stability, one of `experimental`, `beta`, `stable`
5760
- `visibility`: the API stability, one of `public` or `private`.
5861
- `since`: the version of Elasticsearch when the API has been introduced (eg: `7.7.0`).
59-
This field is only available for `stack`.
62+
This field is only available for `stack`. If the API is introduced in multiple major versions (eg: `8.19.0` and `9.1.0`), use the appropriate value in each branch.
6063
- `feature_flag`: the feature flag value, only valid if the `visibility` is set to `feature_flag`.
6164
This field is only available for `stack`.
6265

docs/doc-comments-guide.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ A specification is not only about formalizing data structures, it's also about e
55
Documentation of the TypeScript specification is made using [JSDoc](https://jsdoc.app/) comments, i.e. multiline comments starting with `/**` above a type or field declaration.
66

77
The first phrase is used as the mandatory operation summary in the OpenAPI document.
8-
Refer to [API documentation guidelines](https://docs.elastic.dev/content-architecture/oas#summaries).
8+
Refer to the [Elastic API docs contribution guidelines](https://www.elastic.co/docs/extend/contribute/api-docs/guidelines) to learn more about how to create great documentation for your API.
99

1010
> [!NOTE]
1111
> You must add a period at the end of the phrase for it to parse correctly. The period will be properly omitted from the output OpenAPI document.
@@ -76,6 +76,8 @@ GFM also has implementations in most languages, meaning that code generators wil
7676

7777
## Structuring a doc-comment
7878

79+
For guidelines of how to write great doc-comments, refer to the [Contribute to Elastic API docs](https://www.elastic.co/docs/extend/contribute/api-docs/guidelines#write-descriptions) page.
80+
7981
### Terseness
8082

8183
**Doc comments are reference material**: they should be as succinct as possible while capturing all the necessary information to use the elements they're documenting. Remember that they will often show up in small IDE autocompletion popups!

docs/overlays/elasticsearch-openapi-overlays.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ actions:
1414
1515
## Documentation source and versions
1616
17-
This documentation is derived from the `8.x` branch of the [elasticsearch-specification](https://github.com/elastic/elasticsearch-specification) repository.
17+
This documentation is derived from the `8.19` branch of the [elasticsearch-specification](https://github.com/elastic/elasticsearch-specification) repository.
1818
It is provided under license [Attribution-NonCommercial-NoDerivatives 4.0 International](https://creativecommons.org/licenses/by-nc-nd/4.0/).
1919
2020
This documentation contains work-in-progress information for future Elastic Stack releases.

docs/schema-structure.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ for describing APIs that can't be represented in the specification.
1212
Refer to the [documentation guide](doc-comments-guide.md) to add documentation to types and fields,
1313
and to the [modeling guide](modeling-guide.md) to learn how to model the different types.
1414

15+
> [!TIP]
16+
> To learn more about how to write docs specifically for our [API references](https://www.elastic.co/docs/api/), refer to the [Contribute to Elastic API docs](https://www.elastic.co/docs/extend/contribute/api-docs/).
17+
1518
You can find the schema representing all APIs and types in the [output folder](output/schema/schema.json).
1619
The schema is structured as follows:
1720

output/openapi/elasticsearch-openapi.json

Lines changed: 5 additions & 2 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: 3 additions & 0 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: 15 additions & 3 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: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/_global/delete_by_query/DeleteByQueryRequest.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { float, long } from '@_types/Numeric'
3131
import { QueryContainer } from '@_types/query_dsl/abstractions'
3232
import { Operator } from '@_types/query_dsl/Operator'
3333
import { SlicedScroll } from '@_types/SlicedScroll'
34+
import { Sort } from '@_types/sort'
3435
import { Duration } from '@_types/Time'
3536

3637
/**
@@ -310,5 +311,9 @@ export interface Request extends RequestBase {
310311
* Slice the request manually using the provided slice ID and total number of slices.
311312
*/
312313
slice?: SlicedScroll
314+
/**
315+
* A sort object that specifies the order of deleted documents.
316+
*/
317+
sort?: Sort
313318
}
314319
}

0 commit comments

Comments
 (0)