Skip to content

Commit b44e54c

Browse files
authored
Merge branch 'main' into 583_streamlang_add_timezone_and_locale_params
2 parents 18bae7e + 5ae0125 commit b44e54c

File tree

49 files changed

+6282
-1681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+6282
-1681
lines changed

oas_docs/makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ api-docs: ## Generate Serverless and ESS Kibana OpenAPI bundles
2222
.PHONY: space-aware-api-docs
2323
space-aware-api-docs: ## Add special space aware description entries
2424
@node scripts/promote_space_awareness.js oas_docs/output/kibana.yaml
25-
## Just for ess for now...
26-
# @node scripts/promote_space_awareness.js oas_docs/output/kibana.serverless.yaml
25+
@node scripts/promote_space_awareness.js oas_docs/output/kibana.serverless.yaml
2726

2827
.PHONY: merge-api-docs
2928
merge-api-docs: ## Merge Serverless and ESS Kibana OpenAPI bundles with kbn-openapi-bundler

oas_docs/output/kibana.serverless.yaml

Lines changed: 3037 additions & 292 deletions
Large diffs are not rendered by default.

oas_docs/output/kibana.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103229,8 +103229,9 @@ x-topics:
103229103229
To run APIs in non-default spaces, you must add `s/{space_id}/` to the path.
103230103230
For example:
103231103231

103232-
```
103233-
curl -X GET "http://localhost:5601/s/marketing/api/data_views"
103232+
```bash
103233+
curl -X GET "http://${KIBANA_URL}/s/marketing/api/data_views" \
103234+
-H "Authorization: ApiKey ${API_KEY}"
103234103235
```
103235103236

103236103237
If you use the Kibana console to send API requests, it automatically adds the appropriate space identifier.

oas_docs/overlays/kibana.overlays.shared.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ info:
44
title: Overlays that are applicable to both serverless and non-serverless documents
55
version: 0.0.1
66
actions:
7-
# Add some tag descriptions and displayNames
7+
# Add some tag descriptions and displayNames
88
- target: '$.tags[?(@.name=="maintenance-window")]'
99
description: Change tag description and displayName
1010
update:
@@ -186,7 +186,7 @@ actions:
186186
description: >
187187
Elastic Package Manager (EPM) APIs enable you to manage packages and integrations, including installing, updating, and uninstalling packages, managing custom integrations, and handling package assets.
188188
x-displayName: 'Elastic Package Manager (EPM)'
189-
# Add some spaces API examples
189+
# Add some spaces API examples
190190
- target: "$.paths['/api/spaces/space']['post']"
191191
description: 'Add example to create space API'
192192
update:
@@ -227,3 +227,24 @@ actions:
227227
$ref: '../examples/get_spaces_response1.yaml'
228228
getSpacesResponseExample2:
229229
$ref: '../examples/get_spaces_response2.yaml'
230+
# Add an introduction to spaces
231+
- target: '$'
232+
description: Add an extra page about spaces
233+
update:
234+
x-topics:
235+
- title: Kibana spaces
236+
content: |
237+
Spaces enable you to organize your dashboards and other saved objects into meaningful categories.
238+
You can use the default space or create your own spaces.
239+
240+
To run APIs in non-default spaces, you must add `s/{space_id}/` to the path.
241+
For example:
242+
243+
```bash
244+
curl -X GET "http://${KIBANA_URL}/s/marketing/api/data_views" \
245+
-H "Authorization: ApiKey ${API_KEY}"
246+
```
247+
248+
If you use the Kibana console to send API requests, it automatically adds the appropriate space identifier.
249+
250+
To learn more, check out [Spaces](https://www.elastic.co/docs/deploy-manage/manage-spaces).

oas_docs/overlays/kibana.overlays.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,6 @@ actions:
1515
variables:
1616
kibana_url:
1717
default: localhost:5601
18-
# Add an introduction to spaces
19-
- target: '$'
20-
description: Add an extra page about spaces
21-
update:
22-
x-topics:
23-
- title: Kibana spaces
24-
content: |
25-
Spaces enable you to organize your dashboards and other saved objects into meaningful categories.
26-
You can use the default space or create your own spaces.
27-
28-
To run APIs in non-default spaces, you must add `s/{space_id}/` to the path.
29-
For example:
30-
31-
```
32-
curl -X GET "http://localhost:5601/s/marketing/api/data_views"
33-
```
34-
35-
If you use the Kibana console to send API requests, it automatically adds the appropriate space identifier.
36-
37-
To learn more, check out [Spaces](https://www.elastic.co/docs/deploy-manage/manage-spaces).
3818
# Add tag descriptions that are specific to the Stack APIs
3919
- target: '$.tags[?(@.name=="cases")]'
4020
description: Change tag description and displayName

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,7 @@
19571957
"mochawesome-merge": "^4.3.0",
19581958
"mock-fs": "^5.1.2",
19591959
"ms-chromium-edge-driver": "^0.5.1",
1960-
"msw": "~2.11.1",
1960+
"msw": "~2.11.6",
19611961
"mutation-observer": "^1.0.3",
19621962
"nock": "12.0.3",
19631963
"node-stdlib-browser": "^1.3.1",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"./oas_docs/output/kibana.yaml": 1295,
3-
"./oas_docs/output/kibana.serverless.yaml": 1251
3+
"./oas_docs/output/kibana.serverless.yaml": 1180
44
}

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_parser.g4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ import Expression,
2626
Join;
2727

2828
statements
29-
: {this.isDevVersion()}? setCommand+ singleStatement EOF
30-
| singleStatement EOF
29+
: setCommand* singleStatement EOF
3130
;
3231

3332
singleStatement

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_parser.interp

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)