Skip to content

Commit 231c4fa

Browse files
tonyghianitonyghiani
authored
Merge branch 'main' into core/expose-pricing-methods
2 parents b246855 + 8023585 commit 231c4fa

94 files changed

Lines changed: 4323 additions & 2432 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,7 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/
12921292
/src/platform/test/api_integration/apis/esql/*.ts @elastic/kibana-esql
12931293
/src/platform/test/functional/services/esql.ts @elastic/kibana-esql
12941294
/src/platform/packages/shared/kbn-monaco/src/languages/esql @elastic/kibana-esql
1295+
x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
12951296

12961297
# Global Experience
12971298

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@
11021102
"@mapbox/mapbox-gl-rtl-text": "0.2.3",
11031103
"@mapbox/mapbox-gl-supported": "2.0.1",
11041104
"@mapbox/vector-tile": "1.3.1",
1105-
"@modelcontextprotocol/sdk": "^1.12.1",
1105+
"@modelcontextprotocol/sdk": "^1.13.2",
11061106
"@n8n/json-schema-to-zod": "^1.1.0",
11071107
"@openfeature/core": "^1.8.0",
11081108
"@openfeature/launchdarkly-client-provider": "^0.3.2",
@@ -1906,6 +1906,7 @@
19061906
"oboe": "^2.1.7",
19071907
"openapi-types": "^12.1.3",
19081908
"p-reflect": "2.1.0",
1909+
"p-timeout": "^6.1.4",
19091910
"peggy": "^4.2.0",
19101911
"picomatch": "^4.0.2",
19111912
"pirates": "^4.0.7",

‎packages/kbn-lock-manager/README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
A simple, distributed lock manager built on top of Elasticsearch.
44
Ensures that only one process at a time can hold a named lock, with automatic lease renewal and token fencing for safe release.
55

6+
### Typical scenarios
7+
8+
**Re-indexing**
9+
Starting multiple re-index operation on the same source simultaneously can lead to data corruption. Wrapping the re-index call in `withLock("my_reindex")` guarantees that only one consumer can start the operation.
10+
11+
**Bootstrapping tasks**
12+
On Kibana startup you might need to run migrations, create/update index mappings or bootstrapping other types of assets. Without a lock, every Kibana node that boots in parallel will try to run the same migrations. A lock ensures that the startup migrations only run exactly once, even if multiple Kibana nodes spin up concurrently.
13+
614
# API Documentation
715

816
## `withLock<T>(lockId, callback, options)`
@@ -51,4 +59,4 @@ Each lock has a short, fixed lifespan (default 30s) and will automatically expir
5159
Note: If Kibana node crashes, another process could acquire the same lock and start that task again when the lock automatically expires. To prevent your operation from running multiple times, include an application-level check (for example, querying Elasticsearch or your own status flag) to verify the operation isn’t already in progress before proceeding.
5260

5361
**Token Fencing**
54-
Each lock operation carries a unique token. Only the process with the matching token can extend or release the lock, preventing stale holders from interfering.
62+
Each lock operation carries a unique token. Only the process with the matching token can extend or release the lock, preventing stale holders from interfering.

‎renovate.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3353,6 +3353,24 @@
33533353
"minimumReleaseAge": "7 days",
33543354
"enabled": true
33553355
},
3356+
{
3357+
"groupName": "p-timeout",
3358+
"matchDepNames": [
3359+
"p-timeout"
3360+
],
3361+
"reviewers": [
3362+
"team:obs-ai-assistant"
3363+
],
3364+
"matchBaseBranches": [
3365+
"main"
3366+
],
3367+
"labels": [
3368+
"backport:all-open",
3369+
"release_note:skip"
3370+
],
3371+
"minimumReleaseAge": "7 days",
3372+
"enabled": true
3373+
},
33563374
{
33573375
"groupName": "redux-actions",
33583376
"matchDepNames": [

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

Lines changed: 6 additions & 5 deletions
Large diffs are not rendered by default.

‎src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.tokens‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MULTILINE_COMMENT=2
33
WS=3
44
CHANGE_POINT=4
55
ENRICH=5
6-
EXPLAIN=6
6+
DEV_EXPLAIN=6
77
COMPLETION=7
88
DISSECT=8
99
EVAL=9
@@ -139,7 +139,6 @@ SHOW_MULTILINE_COMMENT=138
139139
SHOW_WS=139
140140
'change_point'=4
141141
'enrich'=5
142-
'explain'=6
143142
'completion'=7
144143
'dissect'=8
145144
'eval'=9

‎src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.ts‎

Lines changed: 639 additions & 628 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ query
3535
;
3636

3737
sourceCommand
38-
: explainCommand
39-
| fromCommand
38+
: fromCommand
4039
| rowCommand
4140
| showCommand
4241
// in development
4342
| {this.isDevVersion()}? timeSeriesCommand
43+
| {this.isDevVersion()}? explainCommand
4444
;
4545

4646
processingCommand
@@ -241,11 +241,11 @@ commandOption
241241
;
242242

243243
explainCommand
244-
: EXPLAIN subqueryExpression
244+
: DEV_EXPLAIN subqueryExpression
245245
;
246246

247247
subqueryExpression
248-
: OPENING_BRACKET query CLOSING_BRACKET
248+
: LP query RP
249249
;
250250

251251
showCommand

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

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MULTILINE_COMMENT=2
33
WS=3
44
CHANGE_POINT=4
55
ENRICH=5
6-
EXPLAIN=6
6+
DEV_EXPLAIN=6
77
COMPLETION=7
88
DISSECT=8
99
EVAL=9
@@ -139,7 +139,6 @@ SHOW_MULTILINE_COMMENT=138
139139
SHOW_WS=139
140140
'change_point'=4
141141
'enrich'=5
142-
'explain'=6
143142
'completion'=7
144143
'dissect'=8
145144
'eval'=9

0 commit comments

Comments
 (0)