Merge branch '7.8' into backport/7.8/pr-66685

Author: elasticmachine

docs/settings/ml-settings.asciidoc

@@ -6,14 +6,14 @@
 ++++
 
 You do not need to configure any settings to use {kib} {ml-features}. They are
-enabled by default.
+enabled by default. 
 
 [[general-ml-settings-kb]]
 ==== General {ml} settings
 
 [cols="2*<"]
 |===
-| `xpack.ml.enabled`
+| `xpack.ml.enabled` {ess-icon}
   | Set to `true` (default) to enable {kib} {ml-features}. +
   +
   If set to `false` in `kibana.yml`, the {ml} icon is hidden in this {kib}
@@ -23,13 +23,7 @@ enabled by default.
 
 |===
 
-[[data-visualizer-settings]]
-==== {data-viz} settings
+[[advanced-ml-settings-kb]]
+==== Advanced {ml} settings
 
-[cols="2*<"]
-|===
-| `xpack.ml.file_data_visualizer.max_file_size`
-  | Sets the file size limit when importing data in the {data-viz}. The default
-  value is `100MB`. The highest supported value for this setting is `1GB`.
-
-|===
+Refer to <<kibana-ml-settings,Advanced {ml} settings in {kib}>>.

package.json

@@ -401,7 +401,7 @@
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
-    "chromedriver": "^81.0.0",
+    "chromedriver": "^83.0.0",
     "classnames": "2.2.6",
     "dedent": "^0.7.0",
     "delete-empty": "^2.0.0",

src/core/server/path/index.ts

@@ -28,7 +28,6 @@ const CONFIG_PATHS = [
   process.env.KIBANA_PATH_CONF && join(process.env.KIBANA_PATH_CONF, 'kibana.yml'),
   process.env.CONFIG_PATH, // deprecated
   fromRoot('config/kibana.yml'),
-  '/etc/kibana/kibana.yml',
 ].filter(isString);
 
 const DATA_PATHS = [

src/dev/build/tasks/os_packages/service_templates/sysv/etc/default/kibana

@@ -11,3 +11,5 @@ nice=""
 KILL_ON_STOP_TIMEOUT=0
 
 BABEL_CACHE_PATH="/var/lib/kibana/optimize/.babel_register_cache.json"
+
+KIBANA_PATH_CONF="/etc/kibana"

src/dev/build/tasks/os_packages/service_templates/sysv/etc/init.d/kibana

@@ -23,6 +23,7 @@ pidfile="/var/run/$name.pid"
 [ -r /etc/default/$name ] && . /etc/default/$name
 [ -r /etc/sysconfig/$name ] && . /etc/sysconfig/$name
 
+export KIBANA_PATH_CONF
 export NODE_OPTIONS
 
 [ -z "$nice" ] && nice=0

src/dev/ci_setup/setup_env.sh

@@ -128,9 +128,17 @@ export GECKODRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfuncti
 export CHROMEDRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
 export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/cypress"
 
-
 export CHECKS_REPORTER_ACTIVE=false
 
+# This is mainly for release-manager builds, which run in an environment that doesn't have Chrome installed
+if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
+  echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"
+  export DETECT_CHROMEDRIVER_VERSION=true
+  export CHROMEDRIVER_FORCE_DOWNLOAD=true
+else
+  echo "Chrome not detected, installing default chromedriver binary for the package version"
+fi
+
 ### only run on pr jobs for elastic/kibana, checks-reporter doesn't work for other repos
 if [[ "$ghprbPullId" && "$ghprbGhRepository" == 'elastic/kibana' ]] ; then
   export CHECKS_REPORTER_ACTIVE=true

src/plugins/console/server/lib/spec_definitions/json/overrides/update_by_query.json

@@ -0,0 +1,17 @@
+{
+  "update_by_query": {
+    "data_autocomplete_rules": {
+      "conflicts": "",
+      "query": {
+        "__scope_link": "GLOBAL.query"
+      },
+      "script": {
+        "__template": {
+          "source": "",
+          "lang": "painless"
+        },
+        "__scope_link": "GLOBAL.script"
+      }
+    }
+  }
+}

x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss

@@ -1,5 +1,5 @@
 body.canvas-isFullscreen { // sass-lint:disable-line no-qualifying-elements
-  // following two rules are for overriding the header bar padding
+  // following two rules are for overriding the header bar padding 
   &.euiBody--headerIsFixed {
     padding-top: 0;
   }
@@ -8,6 +8,12 @@ body.canvas-isFullscreen { // sass-lint:disable-line no-qualifying-elements
     min-height: 100vh;
   }
 
+  // following rule is for docked navigation
+  &.euiBody--collapsibleNavIsDocked {
+    padding-left: 0 !important; // sass-lint:disable-line no-important
+  }
+
+
   // hide global loading indicator
   .kbnLoadingIndicator {
     display: none;

x-pack/plugins/index_lifecycle_management/public/application/services/api.js

@@ -28,8 +28,7 @@ export async function loadIndexTemplates() {
 }
 
 export async function loadPolicies(withIndices) {
-  const query = withIndices ? '?withIndices=true' : '';
-  return await sendGet('policies', query);
+  return await sendGet('policies', { withIndices });
 }
 
 export async function savePolicy(policy) {

x-pack/plugins/lens/server/usage/task.ts

@@ -6,6 +6,7 @@
 
 import { APICaller, CoreSetup, Logger } from 'kibana/server';
 import { Observable } from 'rxjs';
+import { first } from 'rxjs/operators';
 import moment from 'moment';
 import {
   RunContext,
@@ -191,7 +192,7 @@ export function telemetryTaskRunner(
 
     return {
       async run() {
-        const kibanaIndex = (await config.toPromise()).kibana.index;
+        const kibanaIndex = (await config.pipe(first()).toPromise()).kibana.index;
 
         return Promise.all([
           getDailyEvents(kibanaIndex, callCluster),