Skip to content

Commit 828c44e

Browse files
committed
Merge remote-tracking branch 'elastic/7.0' into notable-highlights-7.0
* elastic/7.0: [TEST] Mute WebhookHttpsIntegrationTests.testHttps [DOCS] Add 'time value' links to several monitor settings (elastic#40633) (elastic#40687) Do not perform cleanup if Manifest write fails with dirty exception (elastic#40519) Remove mention of soft deletes from getting started (elastic#40668) Fix bug in detecting use of bundled JDK on macOS Reindex conflicts clarification (docs) (elastic#40442) SQL: [Tests] Enable integration tests for fixed issues (elastic#40664) Add information about the default sort mode (elastic#40657) SQL: [Docs] Fix example for CURDATE SQL: [Docs] Fix doc errors regarding CURRENT_DATE. (elastic#40649) Clarify using time_zone and date math in range query (elastic#40655) Add notice for bundled jdk (elastic#40576) disable kerberos test until kerberos fixture is working again [DOCS] Use "source" instead of "inline" in ML docs (elastic#40635) Unmute and fix testSubParserArray (elastic#40626) Geo Point parse error fix (elastic#40447) Increase suite timeout to 30 minutes for docs tests (elastic#40521) Fix repository-hdfs when no docker and unnecesary fixture Avoid building hdfs-fixure use an image that works instead
2 parents 38e6197 + 6b7a607 commit 828c44e

File tree

30 files changed

+606
-152
lines changed

30 files changed

+606
-152
lines changed

distribution/archives/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
8484
rename { 'LICENSE.txt' }
8585
}
8686

87-
with noticeFile
87+
with noticeFile(oss, jdk)
8888
into('modules') {
8989
with modulesFiles
9090
}

distribution/build.gradle

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,17 @@ task buildServerNotice(type: NoticeTask) {
5252
// other distributions include notices from modules as well, which are added below later
5353
task buildDefaultNotice(type: NoticeTask) {
5454
licensesDir new File(project(':server').projectDir, 'licenses')
55+
licensesDir new File(project(':distribution').projectDir, 'licenses')
5556
}
56-
57-
// other distributions include notices from modules as well, which are added below later
5857
task buildOssNotice(type: NoticeTask) {
5958
licensesDir new File(project(':server').projectDir, 'licenses')
59+
licensesDir new File(project(':distribution').projectDir, 'licenses')
60+
}
61+
task buildDefaultNoJdkNotice(type: NoticeTask) {
62+
licensesDir new File(project(':server').projectDir, 'licenses')
63+
}
64+
task buildOssNoJdkNotice(type: NoticeTask) {
65+
licensesDir new File(project(':server').projectDir, 'licenses')
6066
}
6167

6268
/*****************************************************************************
@@ -377,11 +383,21 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
377383
}
378384
}
379385

380-
noticeFile = copySpec {
381-
if (project.name == 'integ-test-zip') {
382-
from buildServerNotice
383-
} else {
384-
from buildDefaultNotice
386+
noticeFile = { oss, jdk ->
387+
copySpec {
388+
if (project.name == 'integ-test-zip') {
389+
from buildServerNotice
390+
} else {
391+
if (oss && jdk) {
392+
from buildOssNotice
393+
} else if (oss) {
394+
from buildOssNoJdkNotice
395+
} else if (jdk) {
396+
from buildDefaultNotice
397+
} else {
398+
from buildDefaultNoJdkNotice
399+
}
400+
}
385401
}
386402
}
387403

distribution/licenses/openjdk-LICENSE.txt

Lines changed: 347 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Copyright (c) 1995, 2013, Oracle and/or its affiliates.
2+
3+
OpenJDK is licensed under the GPLv2+CE. A copy of that license is included in
4+
this distribution immediately below this notice. You can find a copy of the
5+
OpenJDK source through the downloads page at https://elastic.co.

distribution/packages/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ Closure commonPackageConfig(String type, boolean oss, boolean jdk) {
260260

261261
// the oss package conflicts with the default distribution and vice versa
262262
conflicts('elasticsearch' + (oss ? '' : '-oss'))
263+
264+
into '/usr/share/elasticsearch'
265+
with noticeFile(oss, jdk)
263266
}
264267
}
265268

@@ -294,7 +297,6 @@ ospackage {
294297
permissionGroup 'root'
295298

296299
into '/usr/share/elasticsearch'
297-
with noticeFile
298300
}
299301

300302
Closure commonDebConfig(boolean oss, boolean jdk) {

docs/reference/ccr/getting-started.asciidoc

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,6 @@ image::images/remote-clusters.jpg["The Remote Clusters page in {kib}"]
161161
[[ccr-getting-started-leader-index]]
162162
=== Creating a leader index
163163

164-
Leader indices require a special index setting to ensure that the operations
165-
that need to be replicated are available when the follower requests them from
166-
the leader. This setting is used to control how many soft deletes are retained.
167-
A _soft delete_ occurs whenever a document is deleted or updated. Soft deletes
168-
can be enabled only on new indices created on or after {es} 6.5.0, and enabled
169-
by default on new indices created on or after {es} 7.0.0.
170-
171164
In the following example, we will create a leader index in the remote cluster:
172165

173166
[source,js]
@@ -177,12 +170,7 @@ PUT /server-metrics
177170
"settings" : {
178171
"index" : {
179172
"number_of_shards" : 1,
180-
"number_of_replicas" : 0,
181-
"soft_deletes" : {
182-
"retention" : {
183-
"operations" : 1024 <1>
184-
}
185-
}
173+
"number_of_replicas" : 0
186174
}
187175
},
188176
"mappings" : {
@@ -214,7 +202,6 @@ PUT /server-metrics
214202
--------------------------------------------------
215203
// CONSOLE
216204
// TEST[continued]
217-
<1> Sets that up to 1024 soft deletes will be retained.
218205

219206
[float]
220207
[[ccr-getting-started-follower-index]]

docs/reference/docs/reindex.asciidoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,11 @@ POST _reindex
118118
// CONSOLE
119119
// TEST[setup:twitter]
120120

121-
By default, version conflicts abort the `_reindex` process, but you can just
122-
count them by setting `"conflicts": "proceed"` in the request body:
121+
By default, version conflicts abort the `_reindex` process. The `"conflicts"` request body
122+
parameter can be used to instruct `_reindex` to proceed with the next document on version conflicts.
123+
It is important to note that the handling of other error types is unaffected by the `"conflicts"` parameter.
124+
When `"conflicts": "proceed"` is set in the request body, the `_reindex` process will continue on version conflicts
125+
and return a count of version conflicts encountered:
123126

124127
[source,js]
125128
--------------------------------------------------

docs/reference/ml/transforms.asciidoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ PUT _ml/datafeeds/datafeed-test1
134134
"total_error_count": { <2>
135135
"script": {
136136
"lang": "expression",
137-
"inline": "doc['error_count'].value + doc['aborted_count'].value"
137+
"source": "doc['error_count'].value + doc['aborted_count'].value"
138138
}
139139
}
140140
}
@@ -239,7 +239,7 @@ PUT _ml/datafeeds/datafeed-test2
239239
"my_script_field": {
240240
"script": {
241241
"lang": "painless",
242-
"inline": "doc['some_field'].value + '_' + doc['another_field'].value" <2>
242+
"source": "doc['some_field'].value + '_' + doc['another_field'].value" <2>
243243
}
244244
}
245245
}
@@ -276,7 +276,7 @@ POST _ml/datafeeds/datafeed-test2/_update
276276
"my_script_field": {
277277
"script": {
278278
"lang": "painless",
279-
"inline": "doc['another_field'].value.trim()" <1>
279+
"source": "doc['another_field'].value.trim()" <1>
280280
}
281281
}
282282
}
@@ -312,7 +312,7 @@ POST _ml/datafeeds/datafeed-test2/_update
312312
"my_script_field": {
313313
"script": {
314314
"lang": "painless",
315-
"inline": "doc['some_field'].value.toLowerCase()" <1>
315+
"source": "doc['some_field'].value.toLowerCase()" <1>
316316
}
317317
}
318318
}
@@ -349,7 +349,7 @@ POST _ml/datafeeds/datafeed-test2/_update
349349
"my_script_field": {
350350
"script": {
351351
"lang": "painless",
352-
"inline": "doc['some_field'].value.substring(0, 1).toUpperCase() + doc['some_field'].value.substring(1).toLowerCase()" <1>
352+
"source": "doc['some_field'].value.substring(0, 1).toUpperCase() + doc['some_field'].value.substring(1).toLowerCase()" <1>
353353
}
354354
}
355355
}
@@ -386,7 +386,7 @@ POST _ml/datafeeds/datafeed-test2/_update
386386
"my_script_field": {
387387
"script": {
388388
"lang": "painless",
389-
"inline": "/\\s/.matcher(doc['tokenstring2'].value).replaceAll('_')" <1>
389+
"source": "/\\s/.matcher(doc['tokenstring2'].value).replaceAll('_')" <1>
390390
}
391391
}
392392
}
@@ -422,7 +422,7 @@ POST _ml/datafeeds/datafeed-test2/_update
422422
"my_script_field": {
423423
"script": {
424424
"lang": "painless",
425-
"inline": "def m = /(.*)-bar-([0-9][0-9])/.matcher(doc['tokenstring3'].value); return m.find() ? m.group(1) + '_' + m.group(2) : '';" <1>
425+
"source": "def m = /(.*)-bar-([0-9][0-9])/.matcher(doc['tokenstring3'].value); return m.find() ? m.group(1) + '_' + m.group(2) : '';" <1>
426426
}
427427
}
428428
}
@@ -554,7 +554,7 @@ PUT _ml/datafeeds/datafeed-test4
554554
"script_fields": {
555555
"my_coordinates": {
556556
"script": {
557-
"inline": "doc['coords.lat'].value + ',' + doc['coords.lon'].value",
557+
"source": "doc['coords.lat'].value + ',' + doc['coords.lon'].value",
558558
"lang": "painless"
559559
}
560560
}

docs/reference/query-dsl/range-query.asciidoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ GET _search
138138
--------------------------------------------------
139139
// CONSOLE
140140
<1> This date will be converted to `2014-12-31T23:00:00 UTC`.
141-
<2> `now` is not affected by the `time_zone` parameter (dates must be stored as UTC).
141+
<2> `now` is not affected by the `time_zone` parameter, its always the current system time (in UTC).
142+
However, when using <<date-math,date math rounding>> (e.g. down to the nearest day using `now/d`),
143+
the provided `time_zone` will be considered.
144+
142145

143146
[[querying-range-fields]]
144147
==== Querying range fields

docs/reference/search/request/sort.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ to. The `mode` option can have the following values:
8282
`median`:: Use the median of all values as sort value. Only applicable
8383
for number based array fields.
8484

85+
The default sort mode in the ascending sort order is `min` -- the lowest value
86+
is picked. The default sort mode in the descending order is `max` --
87+
the highest value is picked.
88+
8589
===== Sort mode example usage
8690

8791
In the example below the field price has multiple prices per document.

0 commit comments

Comments
 (0)