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

Author: jasontedor

distribution/archives/build.gradle

@@ -84,7 +84,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
         rename { 'LICENSE.txt' }
       }
 
-      with noticeFile
+      with noticeFile(oss, jdk)
       into('modules') {
         with modulesFiles
       }

distribution/build.gradle

@@ -52,11 +52,17 @@ task buildServerNotice(type: NoticeTask) {
 // other distributions include notices from modules as well, which are added below later
 task buildDefaultNotice(type: NoticeTask) {
   licensesDir new File(project(':server').projectDir, 'licenses')
+  licensesDir new File(project(':distribution').projectDir, 'licenses')
 }
-
-// other distributions include notices from modules as well, which are added below later
 task buildOssNotice(type: NoticeTask) {
   licensesDir new File(project(':server').projectDir, 'licenses')
+  licensesDir new File(project(':distribution').projectDir, 'licenses')
+}
+task buildDefaultNoJdkNotice(type: NoticeTask) {
+  licensesDir new File(project(':server').projectDir, 'licenses')
+}
+task buildOssNoJdkNotice(type: NoticeTask) {
+  licensesDir new File(project(':server').projectDir, 'licenses')
 }
 
 /*****************************************************************************
@@ -377,11 +383,21 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
       }
     }
 
-    noticeFile = copySpec {
-      if (project.name == 'integ-test-zip') {
-        from buildServerNotice
-      } else {
-        from buildDefaultNotice
+    noticeFile = { oss, jdk ->
+      copySpec {
+        if (project.name == 'integ-test-zip') {
+          from buildServerNotice
+        } else {
+          if (oss && jdk) {
+            from buildOssNotice
+          } else if (oss) {
+            from buildOssNoJdkNotice
+          } else if (jdk) {
+            from buildDefaultNotice
+          } else {
+            from buildDefaultNoJdkNotice
+          }
+      }  
       }
     }
 

distribution/licenses/openjdk-LICENSE.txt

@@ -0,0 +1,5 @@
+Copyright (c) 1995, 2013, Oracle and/or its affiliates.
+
+OpenJDK is licensed under the GPLv2+CE. A copy of that license is included in
+this distribution immediately below this notice. You can find a copy of the
+OpenJDK source through the downloads page at https://elastic.co.

distribution/licenses/openjdk-NOTICE.txt

@@ -260,6 +260,9 @@ Closure commonPackageConfig(String type, boolean oss, boolean jdk) {
 
     // the oss package conflicts with the default distribution and vice versa
     conflicts('elasticsearch' + (oss ? '' : '-oss'))
+
+    into '/usr/share/elasticsearch'
+    with noticeFile(oss, jdk)
   }
 }
 
@@ -294,7 +297,6 @@ ospackage {
   permissionGroup 'root'
 
   into '/usr/share/elasticsearch'
-  with noticeFile
 }
 
 Closure commonDebConfig(boolean oss, boolean jdk) {

distribution/packages/build.gradle

@@ -161,13 +161,6 @@ image::images/remote-clusters.jpg["The Remote Clusters page in {kib}"]
 [[ccr-getting-started-leader-index]]
 === Creating a leader index
 
-Leader indices require a special index setting to ensure that the operations
-that need to be replicated are available when the follower requests them from
-the leader. This setting is used to control how many soft deletes are retained.
-A _soft delete_ occurs whenever a document is deleted or updated. Soft deletes
-can be enabled only on new indices created on or after {es} 6.5.0, and enabled
-by default on new indices created on or after {es} 7.0.0.
-
 In the following example, we will create a leader index in the remote cluster:
 
 [source,js]
@@ -177,12 +170,7 @@ PUT /server-metrics
   "settings" : {
     "index" : {
       "number_of_shards" : 1,
-      "number_of_replicas" : 0,
-      "soft_deletes" : {
-        "retention" : {
-          "operations" : 1024 <1>
-        }
-      }
+      "number_of_replicas" : 0
     }
   },
   "mappings" : {
@@ -214,7 +202,6 @@ PUT /server-metrics
 --------------------------------------------------
 // CONSOLE
 // TEST[continued]
-<1> Sets that up to 1024 soft deletes will be retained.
 
 [float]
 [[ccr-getting-started-follower-index]]

docs/reference/ccr/getting-started.asciidoc

@@ -118,8 +118,11 @@ POST _reindex
 // CONSOLE
 // TEST[setup:twitter]
 
-By default, version conflicts abort the `_reindex` process, but you can just
-count them by setting `"conflicts": "proceed"` in the request body:
+By default, version conflicts abort the `_reindex` process. The `"conflicts"` request body
+parameter can be used to instruct `_reindex` to proceed with the next document on version conflicts.
+It is important to note that the handling of other error types is unaffected by the `"conflicts"` parameter.
+When `"conflicts": "proceed"` is set in the request body, the `_reindex` process will continue on version conflicts
+and return a count of version conflicts encountered:
 
 [source,js]
 --------------------------------------------------

docs/reference/docs/reindex.asciidoc

@@ -134,7 +134,7 @@ PUT _ml/datafeeds/datafeed-test1
     "total_error_count": { <2>
       "script": {
         "lang": "expression",
-        "inline": "doc['error_count'].value + doc['aborted_count'].value"
+        "source": "doc['error_count'].value + doc['aborted_count'].value"
       }
     }
   }
@@ -239,7 +239,7 @@ PUT _ml/datafeeds/datafeed-test2
     "my_script_field": {
       "script": {
         "lang": "painless",
-        "inline": "doc['some_field'].value + '_' + doc['another_field'].value" <2>
+        "source": "doc['some_field'].value + '_' + doc['another_field'].value" <2>
       }
     }
   }
@@ -276,7 +276,7 @@ POST _ml/datafeeds/datafeed-test2/_update
     "my_script_field": {
       "script": {
         "lang": "painless",
-        "inline": "doc['another_field'].value.trim()" <1>
+        "source": "doc['another_field'].value.trim()" <1>
       }
     }
   }
@@ -312,7 +312,7 @@ POST _ml/datafeeds/datafeed-test2/_update
     "my_script_field": {
       "script": {
         "lang": "painless",
-        "inline": "doc['some_field'].value.toLowerCase()" <1>
+        "source": "doc['some_field'].value.toLowerCase()" <1>
       }
     }
   }
@@ -349,7 +349,7 @@ POST _ml/datafeeds/datafeed-test2/_update
     "my_script_field": {
       "script": {
         "lang": "painless",
-        "inline": "doc['some_field'].value.substring(0, 1).toUpperCase() + doc['some_field'].value.substring(1).toLowerCase()" <1>
+        "source": "doc['some_field'].value.substring(0, 1).toUpperCase() + doc['some_field'].value.substring(1).toLowerCase()" <1>
       }
     }
   }
@@ -386,7 +386,7 @@ POST _ml/datafeeds/datafeed-test2/_update
     "my_script_field": {
       "script": {
         "lang": "painless",
-        "inline": "/\\s/.matcher(doc['tokenstring2'].value).replaceAll('_')" <1>
+        "source": "/\\s/.matcher(doc['tokenstring2'].value).replaceAll('_')" <1>
       }
     }
   }
@@ -422,7 +422,7 @@ POST _ml/datafeeds/datafeed-test2/_update
     "my_script_field": {
       "script": {
         "lang": "painless",
-        "inline": "def m = /(.*)-bar-([0-9][0-9])/.matcher(doc['tokenstring3'].value); return m.find() ? m.group(1) + '_' + m.group(2) : '';" <1>
+        "source": "def m = /(.*)-bar-([0-9][0-9])/.matcher(doc['tokenstring3'].value); return m.find() ? m.group(1) + '_' + m.group(2) : '';" <1>
       }
     }
   }
@@ -554,7 +554,7 @@ PUT _ml/datafeeds/datafeed-test4
   "script_fields": {
     "my_coordinates": {
       "script": {
-        "inline": "doc['coords.lat'].value + ',' + doc['coords.lon'].value",
+        "source": "doc['coords.lat'].value + ',' + doc['coords.lon'].value",
         "lang": "painless"
       }
     }

docs/reference/ml/transforms.asciidoc

@@ -138,7 +138,10 @@ GET _search
 --------------------------------------------------
 // CONSOLE
 <1> This date will be converted to `2014-12-31T23:00:00 UTC`.
-<2> `now` is not affected by the `time_zone` parameter (dates must be stored as UTC).
+<2> `now` is not affected by the `time_zone` parameter, its always the current system time (in UTC).
+However, when using <<date-math,date math rounding>> (e.g. down to the nearest day using `now/d`),
+the provided `time_zone` will be considered.
+
 
 [[querying-range-fields]]
 ==== Querying range fields

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

@@ -82,6 +82,10 @@ to. The `mode` option can have the following values:
 `median`:: Use the median of all values as sort value.  Only applicable
            for number based array fields.
 
+The default sort mode in the ascending sort order is `min` -- the lowest value
+is picked. The default sort mode in the descending order is `max` --
+the highest value is picked.
+
 ===== Sort mode example usage
 
 In the example below the field price has multiple prices per document.