Skip to content

Commit 445aca9

Browse files
dakronedakrone
committed
Merge remote-tracking branch 'origin/master' into slm-retention
2 parents b442673 + 5fc7880 commit 445aca9

File tree

32 files changed

+985
-342
lines changed

32 files changed

+985
-342
lines changed

‎.ci/init.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ projectsLoaded {
7070
maven configCache()
7171
}
7272
}
73+
rootProject {
74+
project.pluginManager.withPlugin('com.gradle.build-scan') {
75+
buildScan.server = 'https://gradle-enterprise.elastic.co'
76+
}
77+
}
7378
}
7479

7580
if (System.env.GRADLE_BUILD_CACHE_URL != null) {

‎distribution/docker/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ processTestResources {
128128
from project(':x-pack:plugin:core')
129129
.file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
130130
dependsOn configurations.restSpec
131-
// don't add the tasks to build the docker images if we have no way of testing them
132-
if (TestFixturesPlugin.dockerComposeSupported()) {
133-
dependsOn assemble
134-
}
135131
}
136132

137133
task integTest(type: Test) {
138134
maxParallelForks = '1'
139135
include '**/*IT.class'
136+
// don't add the tasks to build the docker images if we have no way of testing them
137+
if (TestFixturesPlugin.dockerComposeSupported()) {
138+
dependsOn assemble
139+
}
140140
}
141141

142142
check.dependsOn integTest

‎distribution/docker/src/test/resources/rest-api-spec/test/11_nodes.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
- match:
88
$body: |
9-
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role master name
10-
^ ((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+ ((-)?\d*(\.\d+)?)? \s+ (-|[dmi]{1,3}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
9+
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role master name
10+
^ ((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+ ((-)?\d*(\.\d+)?)? \s+ (-|[dilm]{1,4}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
1111
1212
- do:
1313
cat.nodes:
1414
v: true
1515

1616
- match:
1717
$body: |
18-
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ node\.role \s+ master \s+ name \n
19-
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[dmi]{1,3}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
18+
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ node\.role \s+ master \s+ name \n
19+
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[dilm]{1,4}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
2020
2121
- do:
2222
cat.nodes:

‎docs/java-rest/high-level/ml/update-filter.asciidoc

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,42 @@
44
:response: PutFilterResponse
55
--
66
[id="{upid}-{api}"]
7-
=== Update Filter API
7+
=== Update filter API
88

9-
The Update Filter API can be used to update an existing {ml} filter
10-
in the cluster. The API accepts a +{request}+ object
11-
as a request and returns a +{response}+.
9+
Updates an existing {ml} filter in the cluster. The API accepts a +{request}+
10+
object as a request and returns a +{response}+.
1211

1312
[id="{upid}-{api}-request"]
14-
==== Update Filter Request
13+
==== Update filter request
1514

1615
A +{request}+ requires the following argument:
1716

1817
["source","java",subs="attributes,callouts,macros"]
1918
--------------------------------------------------
2019
include-tagged::{doc-tests-file}[{api}-request]
2120
--------------------------------------------------
22-
<1> The id of the existing {ml} filter
21+
<1> The id of the existing {ml} filter.
2322

24-
==== Optional Arguments
23+
==== Optional arguments
2524
The following arguments are optional:
2625

2726
["source","java",subs="attributes,callouts,macros"]
2827
--------------------------------------------------
2928
include-tagged::{doc-tests-file}[{api}-description]
3029
--------------------------------------------------
31-
<1> The updated description of the {ml} filter
30+
<1> The updated description of the {ml} filter.
3231

3332
["source","java",subs="attributes,callouts,macros"]
3433
--------------------------------------------------
3534
include-tagged::{doc-tests-file}[{api}-add-items]
3635
--------------------------------------------------
37-
<1> The list of items to add to the {ml} filter
36+
<1> The list of items to add to the {ml} filter.
3837

3938
["source","java",subs="attributes,callouts,macros"]
4039
--------------------------------------------------
4140
include-tagged::{doc-tests-file}[{api}-remove-items]
4241
--------------------------------------------------
43-
<1> The list of items to remove from the {ml} filter
42+
<1> The list of items to remove from the {ml} filter.
4443

4544
include::../execution.asciidoc[]
4645

@@ -54,4 +53,4 @@ the updated {ml} filter if it has been successfully updated.
5453
--------------------------------------------------
5554
include-tagged::{doc-tests-file}[{api}-response]
5655
--------------------------------------------------
57-
<1> The updated `MlFilter`
56+
<1> The updated `MlFilter`.

‎docs/java-rest/high-level/ml/update-job.asciidoc

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,63 @@
44
:response: PutJobResponse
55
--
66
[id="{upid}-{api}"]
7-
=== Update Job API
7+
=== Update {anomaly-job} API
88

9-
The Update Job API provides the ability to update a {ml} job.
10-
It accepts a +{request}+ object and responds
11-
with a +{response}+ object.
9+
Provides the ability to update an {anomaly-job}.
10+
It accepts a +{request}+ object and responds with a +{response}+ object.
1211

1312
[id="{upid}-{api}-request"]
14-
==== Update Job Request
13+
==== Update {anomaly-job} request
1514

1615
An +{request}+ object gets created with a `JobUpdate` object.
1716

1817
["source","java",subs="attributes,callouts,macros"]
1918
--------------------------------------------------
2019
include-tagged::{doc-tests-file}[{api}-request]
2120
--------------------------------------------------
22-
<1> Constructing a new request referencing a `JobUpdate` object
21+
<1> Constructing a new request referencing a `JobUpdate` object.
2322

24-
==== Optional Arguments
23+
==== Optional arguments
2524

26-
The `JobUpdate` object has many optional arguments with which to update an existing {ml}
27-
job. An existing, non-null `jobId` must be referenced in its creation.
25+
The `JobUpdate` object has many optional arguments with which to update an
26+
existing {anomaly-job}. An existing, non-null `jobId` must be referenced in its
27+
creation.
2828

2929
["source","java",subs="attributes,callouts,macros"]
3030
--------------------------------------------------
3131
include-tagged::{doc-tests-file}[{api}-options]
3232
--------------------------------------------------
33-
<1> Mandatory, non-null `jobId` referencing an existing {ml} job
34-
<2> Updated description
35-
<3> Updated analysis limits
36-
<4> Updated background persistence interval
37-
<5> Updated analysis config's categorization filters
38-
<6> Updated detectors through the `JobUpdate.DetectorUpdate` object
39-
<7> Updated group membership
40-
<8> Updated result retention
41-
<9> Updated model plot configuration
42-
<10> Updated model snapshot retention setting
43-
<11> Updated custom settings
44-
<12> Updated renormalization window
33+
<1> Mandatory, non-null `jobId` referencing an existing {anomaly-job}.
34+
<2> Updated description.
35+
<3> Updated analysis limits.
36+
<4> Updated background persistence interval.
37+
<5> Updated analysis config's categorization filters.
38+
<6> Updated detectors through the `JobUpdate.DetectorUpdate` object.
39+
<7> Updated group membership.
40+
<8> Updated result retention.
41+
<9> Updated model plot configuration.
42+
<10> Updated model snapshot retention setting.
43+
<11> Updated custom settings.
44+
<12> Updated renormalization window.
4545

4646
Included with these options are specific optional `JobUpdate.DetectorUpdate` updates.
4747
["source","java",subs="attributes,callouts,macros"]
4848
--------------------------------------------------
4949
include-tagged::{doc-tests-file}[{api}-detector-options]
5050
--------------------------------------------------
51-
<1> The index of the detector. `O` means unknown
52-
<2> The optional description of the detector
53-
<3> The `DetectionRule` rules that apply to this detector
51+
<1> The index of the detector. `O` means unknown.
52+
<2> The optional description of the detector.
53+
<3> The `DetectionRule` rules that apply to this detector.
5454

5555
include::../execution.asciidoc[]
5656

5757
[id="{upid}-{api}-response"]
58-
==== Update Job Response
58+
==== Update {anomaly-job} response
5959

6060
A +{response}+ contains the updated `Job` object
6161

6262
["source","java",subs="attributes,callouts,macros"]
6363
--------------------------------------------------
6464
include-tagged::{doc-tests-file}[{api}-response]
6565
--------------------------------------------------
66-
<1> `getResponse()` returns the updated `Job` object
66+
<1> `getResponse()` returns the updated `Job` object.

‎docs/java-rest/high-level/ml/update-model-snapshot.asciidoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,50 @@
44
:response: UpdateModelSnapshotResponse
55
--
66
[id="{upid}-{api}"]
7-
=== Update Model Snapshot API
7+
=== Update model snapshot API
88

9-
The Update Model Snapshot API provides the ability to update a {ml} model snapshot.
10-
It accepts a +{request}+ object and responds
11-
with a +{response}+ object.
9+
Provides the ability to update a {ml} model snapshot.
10+
It accepts a +{request}+ object and responds with a +{response}+ object.
1211

1312
[id="{upid}-{api}-request"]
14-
==== Update Model Snapshot Request
13+
==== Update model snapshot request
1514

1615
A +{request}+ requires the following arguments:
1716

1817
["source","java",subs="attributes,callouts,macros"]
1918
--------------------------------------------------
2019
include-tagged::{doc-tests-file}[{api}-request]
2120
--------------------------------------------------
22-
<1> Constructing a new request referencing existing `jobId` and `snapshotId` values.
21+
<1> Constructing a new request referencing existing `jobId` and `snapshotId`
22+
values.
2323

24-
==== Optional Arguments
24+
==== Optional arguments
2525

2626
The following arguments are optional:
2727

2828
["source","java",subs="attributes,callouts,macros"]
2929
--------------------------------------------------
3030
include-tagged::{doc-tests-file}[{api}-description]
3131
--------------------------------------------------
32-
<1> The updated description of the {ml} model snapshot
32+
<1> The updated description of the {ml} model snapshot.
3333

3434
["source","java",subs="attributes,callouts,macros"]
3535
--------------------------------------------------
3636
include-tagged::{doc-tests-file}[{api}-retain]
3737
--------------------------------------------------
38-
<1> The updated `retain` property of the {ml} model snapshot
38+
<1> The updated `retain` property of the {ml} model snapshot.
3939

4040

4141
include::../execution.asciidoc[]
4242

4343
[id="{upid}-{api}-response"]
44-
==== Update Job Response
44+
==== Update model snapshot response
4545

4646
A +{response}+ contains an acknowledgement of the update request and the full representation of the updated `ModelSnapshot` object
4747

4848
["source","java",subs="attributes,callouts,macros"]
4949
--------------------------------------------------
5050
include-tagged::{doc-tests-file}[{api}-response]
5151
--------------------------------------------------
52-
<1> An acknowledgement of the request
53-
<2> The updated `ModelSnapshot`
52+
<1> An acknowledgement of the request.
53+
<2> The updated `ModelSnapshot`.

‎docs/reference/analysis.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ to the inverted index:
3232
------
3333

3434
[float]
35+
[[specify-index-time-analyzer]]
3536
=== Specifying an index time analyzer
3637

3738
Each <<text,`text`>> field in a mapping can specify its own

‎docs/reference/cat/nodes.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role master
1818
--------------------------------------------------
1919
// TESTRESPONSE[s/3.07/(\\d+\\.\\d+( \\d+\\.\\d+ (\\d+\\.\\d+)?)?)?/]
2020
// TESTRESPONSE[s/65 99 42/\\d+ \\d+ \\d+/]
21-
// TESTRESPONSE[s/[*]/[*]/ s/mJw06l1/.+/ non_json]
21+
// TESTRESPONSE[s/dim/.+/ s/[*]/[*]/ s/mJw06l1/.+/ non_json]
2222

2323
The first few columns (`ip`, `heap.percent`, `ram.percent`, `cpu`, `load_*`) tell
2424
you where your nodes live and give a quick picture of performance stats.

‎docs/reference/getting-started.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ And the response:
247247
[source,txt]
248248
--------------------------------------------------
249249
ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role master name
250-
127.0.0.1 10 5 5 4.46 dim * PB2SGZY
250+
127.0.0.1 10 5 5 4.46 dim * PB2SGZY
251251
--------------------------------------------------
252252
// TESTRESPONSE[s/10 5 5 4.46/\\d+ \\d+ \\d+ (\\d+\\.\\d+)? (\\d+\\.\\d+)? (\\d+\.\\d+)?/]
253-
// TESTRESPONSE[s/[*]/[*]/ s/PB2SGZY/.+/ non_json]
253+
// TESTRESPONSE[s/dim/.+/ s/[*]/[*]/ s/PB2SGZY/.+/ non_json]
254254

255255
Here, we can see our one node named "PB2SGZY", which is the single node that is currently in our cluster.
256256

‎docs/reference/mapping/removal_of_types.asciidoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ POST _reindex
352352
"type": "user"
353353
},
354354
"dest": {
355-
"index": "users"
355+
"index": "users",
356+
"type": "_doc"
356357
}
357358
}
358359
@@ -363,7 +364,8 @@ POST _reindex
363364
"type": "tweet"
364365
},
365366
"dest": {
366-
"index": "tweets"
367+
"index": "tweets",
368+
"type": "_doc"
367369
}
368370
}
369371
----

‎docs/reference/ml/anomaly-detection/apis/update-job.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ml-update-job]]
4-
=== Update jobs API
4+
=== Update {anomaly-jobs} API
55
++++
66
<titleabbrev>Update jobs</titleabbrev>
77
++++
88

9-
Updates certain properties of a job.
9+
Updates certain properties of an {anomaly-job}.
1010

1111
[[ml-update-job-request]]
1212
==== {api-request-title}
@@ -25,7 +25,7 @@ Updates certain properties of a job.
2525
==== {api-path-parms-title}
2626

2727
`<job_id>`::
28-
(Required, string) Identifier for the job.
28+
(Required, string) Identifier for the {anomaly-job}.
2929

3030
[[ml-update-job-request-body]]
3131
==== {api-request-body-title}
@@ -81,7 +81,7 @@ want to re-run this job with an increased `model_memory_limit`.
8181
--
8282

8383
[[ml-detector-update]]
84-
==== Detector Update Objects
84+
==== Detector update objects
8585

8686
A detector update object has the following properties:
8787

@@ -128,8 +128,8 @@ POST _ml/anomaly_detectors/total-requests/_update
128128
// CONSOLE
129129
// TEST[skip:setup:server_metrics_job]
130130

131-
When the job is updated, you receive a summary of the job configuration
132-
information, including the updated property values. For example:
131+
When the {anomaly-job} is updated, you receive a summary of the job
132+
configuration information, including the updated property values. For example:
133133

134134
[source,js]
135135
----

‎docs/reference/ml/anomaly-detection/apis/update-snapshot.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Updates certain properties of a snapshot.
2525
==== {api-path-parms-title}
2626

2727
`<job_id>`::
28-
(Required, string) Identifier for the job.
28+
(Required, string) Identifier for the {anomaly-job}.
2929

3030
`<snapshot_id>`::
3131
(Required, string) Identifier for the model snapshot.
@@ -42,8 +42,8 @@ The following properties can be updated after the model snapshot is created:
4242
`retain`::
4343
(Optional, boolean) If true, this snapshot will not be deleted during
4444
automatic cleanup of snapshots older than `model_snapshot_retention_days`.
45-
Note that this snapshot will still be deleted when the job is deleted.
46-
The default value is false.
45+
Note that this snapshot will still be deleted when the {anomaly-job} is
46+
deleted. The default value is false.
4747

4848
[[ml-update-snapshot-example]]
4949
==== {api-examples-title}

‎docs/reference/ml/anomaly-detection/apis/validate-detector.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[[ml-valid-detector]]
44
=== Validate detectors API
55
++++
6-
<titleabbrev>Validate detectors </titleabbrev>
6+
<titleabbrev>Validate detectors</titleabbrev>
77
++++
88

99
Validates detector configuration information.
@@ -23,8 +23,8 @@ Validates detector configuration information.
2323
[[ml-valid-detector-desc]]
2424
==== {api-description-title}
2525

26-
The validate detectors API enables you validate the detector configuration
27-
before you create a job.
26+
This API enables you validate the detector configuration
27+
before you create an {anomaly-job}.
2828

2929
[[ml-valid-detector-request-body]]
3030
==== {api-request-body-title}

0 commit comments

Comments
 (0)