Skip to content

Commit fb17603

Browse files
Merge pull request ESQL-605 from elastic/main
🤖 ESQL: Merge upstream
2 parents 96f146b + e7d0d05 commit fb17603

File tree

84 files changed

+1700
-1036
lines changed

Some content is hidden

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

84 files changed

+1700
-1036
lines changed

docs/changelog/91116.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 91116
2+
summary: Add from parameter to Transform Start API
3+
area: Transform
4+
type: enhancement
5+
issues:
6+
- 88646

docs/changelog/92976.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 92976
2+
summary: Report recovered files as recovered from snapshot for fully mounted searchable
3+
snapshots
4+
area: Recovery
5+
type: bug
6+
issues: []

docs/reference/data-streams/downsampling-ilm.asciidoc

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To enable downsampling, add a <<ilm-downsample,Downsample action>> and set
3838
<<ilm-downsample-options,`fixed_interval`>> to the downsampling interval at
3939
which you want to aggregate the original time series data.
4040

41-
In this example, an ILM policy is configired for the `hot` phase. The downsample
41+
In this example, an ILM policy is configured for the `hot` phase. The downsample
4242
takes place after the initial index rollover, which for demonstration
4343
purposes is set to run after five minutes.
4444

@@ -292,7 +292,8 @@ GET _data_stream
292292
If the ILM policy has not yet been applied, your results will be like the
293293
following. Note the original `index_name`: `.ds-datastream-<timestamp>-000001`.
294294

295-
```
295+
[source,console-result]
296+
----
296297
{
297298
"data_streams": [
298299
{
@@ -329,7 +330,9 @@ following. Note the original `index_name`: `.ds-datastream-<timestamp>-000001`.
329330
}
330331
]
331332
}
332-
```
333+
----
334+
// TEST[skip:todo]
335+
// TEST[continued]
333336

334337
Next, run a search query:
335338

@@ -341,7 +344,8 @@ GET datastream/_search
341344

342345
The query returns your ten newly added documents.
343346

344-
```
347+
[source,console-result]
348+
----
345349
{
346350
"took": 17,
347351
"timed_out": false,
@@ -357,7 +361,9 @@ The query returns your ten newly added documents.
357361
"relation": "eq"
358362
},
359363
...
360-
```
364+
----
365+
// TEST[skip:todo]
366+
// TEST[continued]
361367

362368
By default, index lifecycle management checks every ten minutes for indices that
363369
meet policy criteria. Wait for about ten minutes (maybe brew up a quick coffee
@@ -373,7 +379,8 @@ After the ILM policy has taken effect, the original
373379
`.ds-datastream-2022.08.26-000001` index is replaced with a new, downsampled
374380
index, in this case `downsample-6tkn-.ds-datastream-2022.08.26-000001`.
375381

376-
```
382+
[source,console-result]
383+
----
377384
{
378385
"data_streams": [
379386
{
@@ -392,21 +399,24 @@ index, in this case `downsample-6tkn-.ds-datastream-2022.08.26-000001`.
392399
}
393400
],
394401
...
395-
```
402+
----
403+
// TEST[skip:todo]
404+
// TEST[continued]
396405

397406
Run a search query on the datastream.
398407

399408
[source,console]
400409
----
401410
GET datastream/_search
402411
----
403-
// TEST[skip: The @timestamp value won't match an accepted range in the TSDS]
412+
// TEST[continued]
404413

405414
The new downsampled index contains just one document that includes the `min`,
406415
`max`, `sum`, and `value_count` statistics based off of the original sampled
407416
metrics.
408417

409-
```
418+
[source,console-result]
419+
----
410420
{
411421
"took": 6,
412422
"timed_out": false,
@@ -483,7 +493,9 @@ metrics.
483493
]
484494
}
485495
}
486-
```
496+
----
497+
// TEST[skip:todo]
498+
// TEST[continued]
487499

488500
Use the <<data-stream-stats-api,data stream stats API>> to get statistics for
489501
the data stream, including the storage size.
@@ -492,9 +504,10 @@ the data stream, including the storage size.
492504
----
493505
GET /_data_stream/datastream/_stats?human=true
494506
----
495-
// TEST[skip: The @timestamp value won't match an accepted range in the TSDS]
507+
// TEST[continued]
496508

497-
```
509+
[source,console-result]
510+
----
498511
{
499512
"_shards": {
500513
"total": 4,
@@ -515,7 +528,9 @@ GET /_data_stream/datastream/_stats?human=true
515528
}
516529
]
517530
}
518-
```
531+
----
532+
// TEST[skip:todo]
533+
// TEST[continued]
519534

520535
This example demonstrates how downsampling works as part of an ILM policy to
521536
reduce the storage size of metrics data as it becomes less current and less

docs/reference/data-streams/downsampling-manual.asciidoc

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ PUT /sample-01
200200
}
201201
202202
----
203-
// TEST
204203

205204
[discrete]
206205
[[downsampling-manual-ingest-data]]
@@ -209,14 +208,13 @@ PUT /sample-01
209208
In a terminal window with {es} running, run the following curl command to load
210209
the documents from the downloaded sample data file:
211210

212-
//[source,console]
213-
//----
214-
```
211+
[source,sh]
212+
----
215213
curl -s -H "Content-Type: application/json" \
216214
-XPOST http://<elasticsearch-node>/sample-01/_bulk?pretty \
217215
--data-binary @sample-k8s-metrics.json
218-
```
219-
//----
216+
----
217+
// NOTCONSOLE
220218

221219
Approximately 18,000 documents are added. Check the search results for the newly
222220
ingested data:
@@ -227,11 +225,12 @@ GET /sample-01*/_search
227225
----
228226
// TEST[continued]
229227

230-
The query should return the first 10,000 hits. In each document you can see the
231-
time series dimensions (`host`, `node`, `pod` and `container`) as well as the
232-
various CPU and memory time series metrics.
228+
The query has at least 10,000 hits and returns the first 10. In each document
229+
you can see the time series dimensions (`host`, `node`, `pod` and `container`)
230+
as well as the various CPU and memory time series metrics.
233231

234-
```
232+
[source,console-result]
233+
----
235234
"hits": {
236235
"total": {
237236
"value": 10000,
@@ -294,7 +293,9 @@ various CPU and memory time series metrics.
294293
}
295294
}
296295
...
297-
```
296+
----
297+
// TEST[skip:todo]
298+
// TEST[continued]
298299

299300
Next, run a terms aggregation on the set of time series dimensions (`_tsid`) to
300301
create a date histogram on a fixed interval of one day.
@@ -393,11 +394,12 @@ GET /sample-01*/_search
393394
----
394395
// TEST[continued]
395396

396-
In the query results, notice that the numer of hits has been reduced to only 288
397+
In the query results, notice that the number of hits has been reduced to only 288
397398
documents. As well, for each time series metric statistical representations have
398399
been calculated: `min`, `max`, `sum`, and `value_count`.
399400

400-
```
401+
[source,console-result]
402+
----
401403
"hits": {
402404
"total": {
403405
"value": 288,
@@ -455,7 +457,8 @@ been calculated: `min`, `max`, `sum`, and `value_count`.
455457
}
456458
},
457459
...
458-
```
460+
----
461+
// TEST[skip:todo]
459462

460463
This example demonstrates how downsampling can dramatically reduce the number of
461464
records stored for time series data, within whatever time boundaries you choose.

docs/reference/data-streams/downsampling.asciidoc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,14 @@ To downsample a time series index, use the
7272
<<indices-downsample-data-stream,Downsample API>> and set `fixed_interval` to
7373
the level of granularity that you'd like:
7474

75-
```
76-
POST /<source_index>/_downsample/<new_index>
77-
{
78-
"fixed_interval": "1d"
79-
}
80-
```
75+
include::../indices/downsample-data-stream.asciidoc[tag=downsample-example]
8176

8277
To downsample time series data as part of ILM, include a
8378
<<ilm-downsample,Downsample action>> in your ILM policy and set `fixed_interval`
8479
to the level of granularity that you'd like:
8580

86-
```
81+
[source,console]
82+
----
8783
PUT _ilm/policy/my_policy
8884
{
8985
"policy": {
@@ -98,7 +94,7 @@ PUT _ilm/policy/my_policy
9894
}
9995
}
10096
}
101-
```
97+
----
10298

10399
[discrete]
104100
[[querying-downsampled-indices]]

docs/reference/indices/downsample-data-stream.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ a TSDS index that contains metrics sampled every 10 seconds can be downsampled
1414
to an hourly index. All documents within an hour interval are summarized and
1515
stored as a single document in the downsample index.
1616

17+
// tag::downsample-example[]
1718
////
1819
[source,console]
1920
----
@@ -74,6 +75,7 @@ DELETE _index_template/*
7475
----
7576
// TEST[continued]
7677
////
78+
// end::downsample-example[]
7779

7880
[[downsample-api-request]]
7981
==== {api-request-title}

docs/reference/transform/apis/start-transform.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ Identifier for the {transform}.
6161
[[start-transform-query-parms]]
6262
== {api-query-parms-title}
6363

64+
`from`::
65+
(Optional, string) Restricts the set of transformed entities to those changed
66+
after this time. Relative times like now-30d are supported.
67+
Only applicable for continuous transforms.
68+
6469
`timeout`::
6570
(Optional, time)
6671
Period to wait for a response. If no response is received before the timeout

gradle/verification-metadata.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@
274274
<sha256 value="4c2e043200edd9ee7ba6fc378bd5c17784a5bf2388e152d208068b51fd0839cf" origin="Generated by Gradle"/>
275275
</artifact>
276276
</component>
277-
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.14.0">
278-
<artifact name="jackson-core-2.14.0.jar">
279-
<sha256 value="ab4793e5df4fbfae445ca55e9e1439311c80fa8b34fc13162c1260902b4dbea0" origin="Generated by Gradle"/>
277+
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.14.1">
278+
<artifact name="jackson-core-2.14.1.jar">
279+
<sha256 value="0114187e296b34c931c1bf9e5a84152b62bfab7d182f5623f3982dc2da35e526" origin="Generated by Gradle"/>
280280
</artifact>
281281
</component>
282282
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.10.5.1">
@@ -319,19 +319,19 @@
319319
<sha256 value="8a6a687759739421b1f3c3f9678e7bc1cb37df5832e365996e2f412d7ca7e860" origin="Generated by Gradle"/>
320320
</artifact>
321321
</component>
322-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.14.0">
323-
<artifact name="jackson-dataformat-cbor-2.14.0.jar">
324-
<sha256 value="f93c35d8b48ebc8bfe96a9d9e6d7e473f4744eb74819213e1d3af6ba40c940d2" origin="Generated by Gradle"/>
322+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.14.1">
323+
<artifact name="jackson-dataformat-cbor-2.14.1.jar">
324+
<sha256 value="aa491e4850fbf278d321d42e924e0471aa51666584baf200d1851bb1ce4562c1" origin="Generated by Gradle"/>
325325
</artifact>
326326
</component>
327327
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.13.2">
328328
<artifact name="jackson-dataformat-smile-2.13.2.jar">
329329
<sha256 value="cc492aaeeb5cdb899d175c8433846eeddf2a52e92aee79e94ce6a34f86f38f98" origin="Generated by Gradle"/>
330330
</artifact>
331331
</component>
332-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.14.0">
333-
<artifact name="jackson-dataformat-smile-2.14.0.jar">
334-
<sha256 value="5cc75dadecccbd4f74bd27304ee3fd5c642adcad0fd1df97dcc670c04e15b367" origin="Generated by Gradle"/>
332+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.14.1">
333+
<artifact name="jackson-dataformat-smile-2.14.1.jar">
334+
<sha256 value="63dacc4cc9288b89ef9d3e664fed687ba296c9f808e674e95884aea387a9e552" origin="Generated by Gradle"/>
335335
</artifact>
336336
</component>
337337
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.13.2">
@@ -349,9 +349,9 @@
349349
<sha256 value="e0a4d674e5aaf30ed3cd045e7fd94e9b82f0a7fbe94b25c8c496f70977966ba3" origin="Generated by Gradle"/>
350350
</artifact>
351351
</component>
352-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.0">
353-
<artifact name="jackson-dataformat-yaml-2.14.0.jar">
354-
<sha256 value="76e8a33ef1f5f8cce9668ebaf8999626846ccacb36dea81bcdaf79e32443de33" origin="Generated by Gradle"/>
352+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.1">
353+
<artifact name="jackson-dataformat-yaml-2.14.1.jar">
354+
<sha256 value="9e157e2625ed855ab73af7915e256f6823993a30982f4923c9ca82bb752a0303" origin="Generated by Gradle"/>
355355
</artifact>
356356
</component>
357357
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.13.2">

libs/x-content/impl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apply plugin: 'elasticsearch.java'
1010

1111
archivesBaseName = "x-content-impl"
1212

13-
String jacksonVersion = "2.14.0"
13+
String jacksonVersion = "2.14.1"
1414

1515
dependencies {
1616
compileOnly project(':libs:elasticsearch-core')

rest-api-spec/src/main/resources/rest-api-spec/api/transform.start_transform.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
]
2727
},
2828
"params":{
29+
"from":{
30+
"type":"string",
31+
"required":false,
32+
"description":"Restricts the set of transformed entities to those changed after this time"
33+
},
2934
"timeout":{
3035
"type":"time",
3136
"required":false,

0 commit comments

Comments
 (0)