Skip to content

Commit 59a6830

Browse files
DaveCTurnerDaveCTurner
committed
Merge branch '7.x' into peer-recovery-retention-leases-7.x
2 parents fb39bb0 + f6efc55 commit 59a6830

File tree

73 files changed

+1720
-724
lines changed

Some content is hidden

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

73 files changed

+1720
-724
lines changed

‎client/rest-high-level/src/main/java/org/elasticsearch/client/MachineLearningClient.java

+28-14
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,8 @@ public void setUpgradeModeAsync(SetUpgradeModeRequest request, RequestOptions op
18941894
* Creates a new Data Frame Analytics config
18951895
* <p>
18961896
* For additional info
1897-
* see <a href="https://www.TODO.com">PUT Data Frame Analytics documentation</a>
1897+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/put-dfanalytics.html">
1898+
* PUT Data Frame Analytics documentation</a>
18981899
*
18991900
* @param request The {@link PutDataFrameAnalyticsRequest} containing the
19001901
* {@link org.elasticsearch.client.ml.dataframe.DataFrameAnalyticsConfig}
@@ -1916,7 +1917,8 @@ public PutDataFrameAnalyticsResponse putDataFrameAnalytics(PutDataFrameAnalytics
19161917
* Creates a new Data Frame Analytics config asynchronously and notifies listener upon completion
19171918
* <p>
19181919
* For additional info
1919-
* see <a href="https://www.TODO.com">PUT Data Frame Analytics documentation</a>
1920+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/put-dfanalytics.html">
1921+
* PUT Data Frame Analytics documentation</a>
19201922
*
19211923
* @param request The {@link PutDataFrameAnalyticsRequest} containing the
19221924
* {@link org.elasticsearch.client.ml.dataframe.DataFrameAnalyticsConfig}
@@ -1937,7 +1939,8 @@ public void putDataFrameAnalyticsAsync(PutDataFrameAnalyticsRequest request, Req
19371939
* Gets a single or multiple Data Frame Analytics configs
19381940
* <p>
19391941
* For additional info
1940-
* see <a href="https://www.TODO.com">GET Data Frame Analytics documentation</a>
1942+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics.html">
1943+
* GET Data Frame Analytics documentation</a>
19411944
*
19421945
* @param request The {@link GetDataFrameAnalyticsRequest}
19431946
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -1957,7 +1960,8 @@ public GetDataFrameAnalyticsResponse getDataFrameAnalytics(GetDataFrameAnalytics
19571960
* Gets a single or multiple Data Frame Analytics configs asynchronously and notifies listener upon completion
19581961
* <p>
19591962
* For additional info
1960-
* see <a href="https://www.TODO.com">GET Data Frame Analytics documentation</a>
1963+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics.html">
1964+
* GET Data Frame Analytics documentation</a>
19611965
*
19621966
* @param request The {@link GetDataFrameAnalyticsRequest}
19631967
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -1977,7 +1981,8 @@ public void getDataFrameAnalyticsAsync(GetDataFrameAnalyticsRequest request, Req
19771981
* Gets the running statistics of a Data Frame Analytics
19781982
* <p>
19791983
* For additional info
1980-
* see <a href="https://www.TODO.com">GET Data Frame Analytics Stats documentation</a>
1984+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics-stats.html">
1985+
* GET Data Frame Analytics Stats documentation</a>
19811986
*
19821987
* @param request The {@link GetDataFrameAnalyticsStatsRequest}
19831988
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -1996,7 +2001,8 @@ public GetDataFrameAnalyticsStatsResponse getDataFrameAnalyticsStats(GetDataFram
19962001
* Gets the running statistics of a Data Frame Analytics asynchronously and notifies listener upon completion
19972002
* <p>
19982003
* For additional info
1999-
* see <a href="https://www.TODO.com">GET Data Frame Analytics Stats documentation</a>
2004+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics-stats.html">
2005+
* GET Data Frame Analytics Stats documentation</a>
20002006
*
20012007
* @param request The {@link GetDataFrameAnalyticsStatsRequest}
20022008
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2016,7 +2022,8 @@ public void getDataFrameAnalyticsStatsAsync(GetDataFrameAnalyticsStatsRequest re
20162022
* Starts Data Frame Analytics
20172023
* <p>
20182024
* For additional info
2019-
* see <a href="https://www.TODO.com">Start Data Frame Analytics documentation</a>
2025+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/start-dfanalytics.html">
2026+
* Start Data Frame Analytics documentation</a>
20202027
*
20212028
* @param request The {@link StartDataFrameAnalyticsRequest}
20222029
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2036,7 +2043,8 @@ public AcknowledgedResponse startDataFrameAnalytics(StartDataFrameAnalyticsReque
20362043
* Starts Data Frame Analytics asynchronously and notifies listener upon completion
20372044
* <p>
20382045
* For additional info
2039-
* see <a href="https://www.TODO.com">Start Data Frame Analytics documentation</a>
2046+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/start-dfanalytics.html">
2047+
* Start Data Frame Analytics documentation</a>
20402048
*
20412049
* @param request The {@link StartDataFrameAnalyticsRequest}
20422050
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2056,7 +2064,8 @@ public void startDataFrameAnalyticsAsync(StartDataFrameAnalyticsRequest request,
20562064
* Stops Data Frame Analytics
20572065
* <p>
20582066
* For additional info
2059-
* see <a href="https://www.TODO.com">Stop Data Frame Analytics documentation</a>
2067+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-dfanalytics.html">
2068+
* Stop Data Frame Analytics documentation</a>
20602069
*
20612070
* @param request The {@link StopDataFrameAnalyticsRequest}
20622071
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2076,7 +2085,8 @@ public StopDataFrameAnalyticsResponse stopDataFrameAnalytics(StopDataFrameAnalyt
20762085
* Stops Data Frame Analytics asynchronously and notifies listener upon completion
20772086
* <p>
20782087
* For additional info
2079-
* see <a href="https://www.TODO.com">Stop Data Frame Analytics documentation</a>
2088+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-dfanalytics.html">
2089+
* Stop Data Frame Analytics documentation</a>
20802090
*
20812091
* @param request The {@link StopDataFrameAnalyticsRequest}
20822092
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2096,7 +2106,8 @@ public void stopDataFrameAnalyticsAsync(StopDataFrameAnalyticsRequest request, R
20962106
* Deletes the given Data Frame Analytics config
20972107
* <p>
20982108
* For additional info
2099-
* see <a href="https://www.TODO.com">DELETE Data Frame Analytics documentation</a>
2109+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-dfanalytics.html">
2110+
* DELETE Data Frame Analytics documentation</a>
21002111
*
21012112
* @param request The {@link DeleteDataFrameAnalyticsRequest}
21022113
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2116,7 +2127,8 @@ public AcknowledgedResponse deleteDataFrameAnalytics(DeleteDataFrameAnalyticsReq
21162127
* Deletes the given Data Frame Analytics config asynchronously and notifies listener upon completion
21172128
* <p>
21182129
* For additional info
2119-
* see <a href="https://www.TODO.com">DELETE Data Frame Analytics documentation</a>
2130+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-dfanalytics.html">
2131+
* DELETE Data Frame Analytics documentation</a>
21202132
*
21212133
* @param request The {@link DeleteDataFrameAnalyticsRequest}
21222134
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2136,7 +2148,8 @@ public void deleteDataFrameAnalyticsAsync(DeleteDataFrameAnalyticsRequest reques
21362148
* Evaluates the given Data Frame
21372149
* <p>
21382150
* For additional info
2139-
* see <a href="https://www.TODO.com">Evaluate Data Frame documentation</a>
2151+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/evaluate-dfanalytics.html">
2152+
* Evaluate Data Frame documentation</a>
21402153
*
21412154
* @param request The {@link EvaluateDataFrameRequest}
21422155
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
@@ -2156,7 +2169,8 @@ public EvaluateDataFrameResponse evaluateDataFrame(EvaluateDataFrameRequest requ
21562169
* Evaluates the given Data Frame asynchronously and notifies listener upon completion
21572170
* <p>
21582171
* For additional info
2159-
* see <a href="https://www.TODO.com">Evaluate Data Frame documentation</a>
2172+
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/evaluate-dfanalytics.html">
2173+
* Evaluate Data Frame documentation</a>
21602174
*
21612175
* @param request The {@link EvaluateDataFrameRequest}
21622176
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized

‎docs/build.gradle

+39
Original file line numberDiff line numberDiff line change
@@ -1146,3 +1146,42 @@ buildRestTests.setups['kibana_sample_data_ecommerce'] = '''
11461146
number_of_shards: 1
11471147
number_of_replicas: 0
11481148
'''
1149+
buildRestTests.setups['setup_logdata'] = '''
1150+
- do:
1151+
indices.create:
1152+
index: logdata
1153+
body:
1154+
settings:
1155+
number_of_shards: 1
1156+
number_of_replicas: 1
1157+
mappings:
1158+
properties:
1159+
grade:
1160+
type: byte
1161+
- do:
1162+
bulk:
1163+
index: logdata
1164+
refresh: true
1165+
body: |
1166+
{"index":{}}
1167+
{"grade": 100, "weight": 2}
1168+
{"index":{}}
1169+
{"grade": 50, "weight": 3}
1170+
'''
1171+
buildRestTests.setups['logdata_job'] = buildRestTests.setups['setup_logdata'] + '''
1172+
- do:
1173+
ml.put_data_frame_analytics:
1174+
id: "loganalytics"
1175+
body: >
1176+
{
1177+
"source": {
1178+
"index": "logdata"
1179+
},
1180+
"dest": {
1181+
"index": "logdata_out"
1182+
},
1183+
"analysis": {
1184+
"outlier_detection": {}
1185+
}
1186+
}
1187+
'''

‎docs/reference/data-frames/apis/preview-transform.asciidoc

+18
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ Previews a {dataframe-transform}.
3030
{stack-ov}/security-privileges.html[Security privileges] and
3131
{stack-ov}/built-in-roles.html[Built-in roles].
3232

33+
[discrete]
34+
[[preview-data-frame-transform-desc]]
35+
==== {api-description-title}
36+
37+
This API generates a preview of the results that you will get when you run the
38+
<<put-data-frame-transform,create {dataframe-transforms} API>> with the same
39+
configuration. It returns a maximum of 100 results. The calculations are based
40+
on all the current data in the source index.
41+
3342
[discrete]
3443
[[preview-data-frame-transform-request-body]]
3544
==== {api-request-body-title}
@@ -40,6 +49,15 @@ Previews a {dataframe-transform}.
4049
`pivot` (Required)::
4150
(object) Defines the pivot function `group by` fields and the aggregation to
4251
reduce the data. See <<data-frame-transform-pivot>>.
52+
53+
[discrete]
54+
[[preview-data-frame-transform-response]]
55+
==== {api-response-body-title}
56+
57+
`preview`::
58+
(array) An array of documents. In particular, they are the JSON
59+
representation of the documents that would be created in the destination index
60+
by the {dataframe-transform}.
4361

4462
[discrete]
4563
==== {api-examples-title}

‎docs/reference/index-modules/translog.asciidoc

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ although this is rarely needed.
2626
=== Translog settings
2727

2828
The data in the translog is only persisted to disk when the translog is
29-
++fsync++ed and committed. In the event of hardware failure, any data written
30-
since the previous translog commit will be lost.
29+
++fsync++ed and committed. In the event of a hardware failure or an operating
30+
system crash or a JVM crash or a shard failure, any data written since the
31+
previous translog commit will be lost.
3132

3233
By default, `index.translog.durability` is set to `request` meaning that Elasticsearch will only report success of an index, delete,
3334
update, or bulk request to the client after the translog has been successfully
@@ -59,7 +60,7 @@ update, or bulk request. This setting accepts the following parameters:
5960
`async`::
6061

6162
`fsync` and commit in the background every `sync_interval`. In
62-
the event of hardware failure, all acknowledged writes since the last
63+
the event of a failure, all acknowledged writes since the last
6364
automatic commit will be discarded.
6465
--
6566

‎docs/reference/migration/migrate_7_4.asciidoc

+10
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,13 @@ TokenizerFactory now has a `name()` method that must be implemented. Most
2828
plugin-provided TokenizerFactory implementations will extend `AbstractTokenizerFactory`,
2929
which now takes a `name` parameter in its constructor.
3030

31+
[float]
32+
[[breaking_74_search_changes]]
33+
=== Search Changes
34+
35+
[float]
36+
==== Forbid empty doc values in vector functions
37+
If a document doesn't have a value for a vector field (dense_vector
38+
or sparse_vector) on which a vector function is executed, an error will
39+
be thrown.
40+

‎docs/reference/ml/apis/delete-dfanalytics.asciidoc

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
[role="xpack"]
2+
[testenv="platinum"]
3+
[[delete-dfanalytics]]
4+
=== Delete {dfanalytics-jobs} API
5+
[subs="attributes"]
6+
++++
7+
<titleabbrev>Delete {dfanalytics-jobs}</titleabbrev>
8+
++++
9+
10+
experimental[]
11+
12+
Deletes an existing {dfanalytics-job}.
13+
14+
[[ml-delete-dfanalytics-request]]
15+
==== {api-request-title}
16+
17+
`DELETE _ml/data_frame/analytics/<data_frame_analytics_id>`
18+
19+
[[ml-delete-dfanalytics-prereq]]
20+
==== {api-prereq-title}
21+
22+
* You must have `machine_learning_admin` built-in role to use this API. For more
23+
information, see {stack-ov}/security-privileges.html[Security privileges] and
24+
{stack-ov}/built-in-roles.html[Built-in roles].
25+
26+
[[ml-delete-dfanalytics-path-params]]
27+
==== {api-path-parms-title}
28+
29+
`<data_frame_analytics_id>` (Required)::
30+
(string) Identifier for the {dfanalytics-job} you want to delete.
31+
32+
[[ml-delete-dfanalytics-example]]
33+
==== {api-examples-title}
34+
35+
The following example deletes the `loganalytics` {dfanalytics-job}:
36+
37+
[source,js]
38+
--------------------------------------------------
39+
DELETE _ml/data_frame/analytics/loganalytics
40+
--------------------------------------------------
41+
// CONSOLE
42+
// TEST[skip:TBD]
43+
44+
The API returns the following result:
45+
46+
[source,js]
47+
----
48+
{
49+
"acknowledged" : true
50+
}
51+
----
52+
// TESTRESPONSE

0 commit comments

Comments
 (0)