Merge branch 'master' into additional-metrics-for-kpi

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.16.0
+ARG NODE_VERSION=14.16.1
 
 FROM node:${NODE_VERSION} AS base
 

.github/workflows/project-assigner.yml

@@ -11,7 +11,5 @@ jobs:
         uses: elastic/github-actions/project-assigner@v2.0.0
         id: project_assigner
         with:
-          issue-mappings: '[{"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"}, {"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"}], {"label": "Feature:Input Controls", "projectNumber": 72, "columnName": "Inbox"}]'
+          issue-mappings: '[{"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"}, {"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Input Controls", "projectNumber": 72, "columnName": "Inbox"}]'
           ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
-
-

.node-version

@@ -1 +1 @@
-14.16.0
+14.16.1

.nvmrc

@@ -1 +1 @@
-14.16.0
+14.16.1

WORKSPACE.bazel

@@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.2.3")
 # we can update that rule.
 node_repositories(
   node_repositories = {
-    "14.16.0-darwin_amd64": ("node-v14.16.0-darwin-x64.tar.gz", "node-v14.16.0-darwin-x64", "14ec767e376d1e2e668f997065926c5c0086ec46516d1d45918af8ae05bd4583"),
-    "14.16.0-linux_arm64": ("node-v14.16.0-linux-arm64.tar.xz", "node-v14.16.0-linux-arm64", "440489a08bfd020e814c9e65017f58d692299ac3f150c8e78d01abb1104c878a"),
-    "14.16.0-linux_s390x": ("node-v14.16.0-linux-s390x.tar.xz", "node-v14.16.0-linux-s390x", "335348e46f45284b6356416ef58f85602d2dee99094588b65900f6c8839df77e"),
-    "14.16.0-linux_amd64": ("node-v14.16.0-linux-x64.tar.xz", "node-v14.16.0-linux-x64", "2e079cf638766fedd720d30ec8ffef5d6ceada4e8b441fc2a093cb9a865f4087"),
-    "14.16.0-windows_amd64": ("node-v14.16.0-win-x64.zip", "node-v14.16.0-win-x64", "716045c2f16ea10ca97bd04cf2e5ef865f9c4d6d677a9bc25e2ea522b594af4f"),
+    "14.16.1-darwin_amd64": ("node-v14.16.1-darwin-x64.tar.gz", "node-v14.16.1-darwin-x64", "b762b72fc149629b7e394ea9b75a093cad709a9f2f71480942945d8da0fc1218"),
+    "14.16.1-linux_arm64": ("node-v14.16.1-linux-arm64.tar.xz", "node-v14.16.1-linux-arm64", "b4d474e79f7d33b3b4430fad25c3f836b82ce2d5bb30d4a2c9fa20df027e40da"),
+    "14.16.1-linux_s390x": ("node-v14.16.1-linux-s390x.tar.xz", "node-v14.16.1-linux-s390x", "af9982fef32e4a3e4a5d66741dcf30ac9c27613bd73582fa1dae1fb25003047a"),
+    "14.16.1-linux_amd64": ("node-v14.16.1-linux-x64.tar.xz", "node-v14.16.1-linux-x64", "85a89d2f68855282c87851c882d4c4bbea4cd7f888f603722f0240a6e53d89df"),
+    "14.16.1-windows_amd64": ("node-v14.16.1-win-x64.zip", "node-v14.16.1-win-x64", "e469db37b4df74627842d809566c651042d86f0e6006688f0f5fe3532c6dfa41"),
   },
-  node_version = "14.16.0",
+  node_version = "14.16.1",
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],

docs/canvas/canvas-expression-lifecycle.asciidoc

@@ -177,8 +177,8 @@ Since all of the sub-expressions are now resolved into actual values, the <<imag
 demodata
 | image dataurl={
   if condition={getCell price | gte 100} 
-    then={asset 3cb3ec3a-84d7-48fa-8709-274ad5cc9e0b} 
-    else={asset cbc11a1f-8f25-4163-94b4-2c3a060192e7}
+    then={asset "asset-3cb3ec3a-84d7-48fa-8709-274ad5cc9e0b"} 
+    else={asset "asset-cbc11a1f-8f25-4163-94b4-2c3a060192e7"}
 }
 ----
 

docs/canvas/canvas-function-reference.asciidoc

@@ -376,6 +376,37 @@ Clears the _context_, and returns `null`.
 *Returns:* `null`
 
 
+[float]
+[[clog_fn]]
+=== `clog`
+
+It outputs the _context_ in the console. This function is for debug purpose.
+
+*Expression syntax*
+[source,js]
+----
+clog
+----
+
+*Code example*
+[source,text]
+----
+filters
+  | demodata
+  | clog 
+  | filterrows fn={getCell "age" | gt 70}
+  | clog 
+  | pointseries x="time" y="mean(price)"
+  | plot defaultStyle={seriesStyle lines=1 fill=1}
+  | render
+----
+This prints the `datatable` objects in the browser console before and after the `filterrows` function.
+
+*Accepts:* `any`
+
+*Returns:* `any`
+
+
 [float]
 [[columns_fn]]
 === `columns`

docs/settings/alert-action-settings.asciidoc

@@ -59,6 +59,12 @@ You can configure the following settings in the `kibana.yml` file.
 | `xpack.actions.proxyUrl` {ess-icon}
   | Specifies the proxy URL to use, if using a proxy for actions. By default, no proxy is used.
 
+| `xpack.actions.proxyBypassHosts` {ess-icon}
+  | Specifies hostnames which should not use the proxy, if using a proxy for actions. The value is an array of hostnames as strings.  By default, all hosts will use the proxy, but if an action's hostname is in this list, the proxy will not be used.  The settings `xpack.actions.proxyBypassHosts` and `xpack.actions.proxyOnlyHosts` cannot be used at the same time.
+
+| `xpack.actions.proxyOnlyHosts` {ess-icon}
+  | Specifies hostnames which should only use the proxy, if using a proxy for actions. The value is an array of hostnames as strings.  By default, no hosts will use the proxy, but if an action's hostname is in this list, the proxy will be used.  The settings `xpack.actions.proxyBypassHosts` and `xpack.actions.proxyOnlyHosts` cannot be used at the same time.
+
 | `xpack.actions.proxyHeaders` {ess-icon}
   | Specifies HTTP headers for the proxy, if using a proxy for actions. Defaults to {}.
 
@@ -71,6 +77,13 @@ a|`xpack.actions.`
   +
   As an alternative to setting both `xpack.actions.proxyRejectUnauthorizedCertificates` and `xpack.actions.rejectUnauthorized`, you can point the OS level environment variable `NODE_EXTRA_CA_CERTS` to a file that contains the root CAs needed to trust certificates.
 
+| `xpack.actions.maxResponseContentLength` {ess-icon}
+  | Specifies the max number of bytes of the http response for requests to external resources. Defaults to 1000000 (1MB).
+
+| `xpack.actions.responseTimeout` {ess-icon}
+  | Specifies the time allowed for requests to external resources. Requests that take longer are aborted. The time is formatted as <count>[ms|s|m|h|d|w|M|Y], for example, '20m', '24h', '7d', '1w'. Defaults to 60s.
+
+
 |===
 
 [float]

docs/setup/upgrade/upgrade-migrations.asciidoc

@@ -50,6 +50,16 @@ For large deployments with more than 10 {kib} instances and more than 10 000 sav
 ==== Preventing migration failures
 This section highlights common causes of {kib} upgrade failures and how to prevent them.
 
+[float]
+===== timeout_exception or receive_timeout_transport_exception
+There is a known issue in v7.12.0 for users who tried the fleet beta. Upgrade migrations fail because of a large number of documents in the `.kibana` index.
+
+This can cause Kibana to log errors like:
+> Error: Unable to complete saved object migrations for the [.kibana] index. Please check the health of your Elasticsearch cluster and try again. Error: [receive_timeout_transport_exception]: [instance-0000000002][10.32.1.112:19541][cluster:monitor/task/get] request_id [2648] timed out after [59940ms]
+> Error: Unable to complete saved object migrations for the [.kibana] index. Please check the health of your Elasticsearch cluster and try again. Error: [timeout_exception]: Timed out waiting for completion of [org.elasticsearch.index.reindex.BulkByScrollTask@6a74c54]
+
+See https://github.com/elastic/kibana/issues/95321 for instructions to work around this issue.
+
 [float]
 ===== Corrupt saved objects
 We highly recommend testing your {kib} upgrade in a development cluster to discover and remedy problems caused by corrupt documents, especially when there are custom integrations creating saved objects in your environment. Saved objects that were corrupted through manual editing or integrations will cause migration failures with a log message like `Failed to transform document. Transform: index-pattern:7.0.0\n Doc: {...}` or `Unable to migrate the corrupt Saved Object document ...`. Corrupt documents will have to be fixed or deleted before an upgrade migration can succeed.

docs/user/dashboard/timelion.asciidoc

@@ -33,6 +33,40 @@ If the value of your parameter contains spaces or commas you have to put the val
 
 .es(q='some query', index=logstash-*)
 
+[float]
+[[customize-data-series-y-axis]]
+===== .yaxis() function
+
+{kib} supports many y-axis scales and ranges for your data series.
+
+The `.yaxis()` function supports the following parameters:
+
+* *yaxis* — The numbered y-axis to plot the series on. For example, use `.yaxis(2)` to display a second y-axis.
+* *min* — The minimum value for the y-axis range.
+* *max* — The maximum value for the y-axis range.
+* *position* — The location of the units. Values include `left` or `right`.  
+* *label* — The label for the axis.  
+* *color* — The color of the axis label.
+* *units* — The function to use for formatting the y-axis labels. Values include `bits`, `bits/s`, `bytes`, `bytes/s`, `currency(:ISO 4217 currency code)`, `percent`, and `custom(:prefix:suffix)`.
+* *tickDecimals* — The tick decimal precision.
+
+Example:
+
+[source,text]
+----------------------------------
+.es(index= kibana_sample_data_logs,
+    timefield='@timestamp',
+    metric='avg:bytes')
+  .label('Average Bytes for request')
+  .title('Memory consumption over time in bytes').yaxis(1,units=bytes,position=left), <1>
+.es(index= kibana_sample_data_logs,
+    timefield='@timestamp',
+    metric=avg:machine.ram)
+  .label('Average Machine RAM amount').yaxis(2,units=bytes,position=right) <2>
+----------------------------------
+
+<1> `.yaxis(1,units=bytes,position=left)` &mdash; Specifies the first y-axis for the first data series, and changes the units on the left.
+<2> `.yaxis(2,units=bytes,position=left)` &mdash; Specifies the second y-axis for the second data series, and changes the units on the right.
 
 [float]
 ==== Tutorial: Create visualizations with Timelion 

package.json

@@ -92,7 +92,7 @@
     "**/typescript": "4.1.3"
   },
   "engines": {
-    "node": "14.16.0",
+    "node": "14.16.1",
     "yarn": "^1.21.1"
   },
   "dependencies": {
@@ -206,7 +206,6 @@
     "content-disposition": "0.5.3",
     "copy-to-clipboard": "^3.0.8",
     "core-js": "^3.6.5",
-    "css-minimizer-webpack-plugin": "^1.3.0",
     "custom-event-polyfill": "^0.3.0",
     "cytoscape": "^3.10.0",
     "cytoscape-dagre": "^2.2.2",
@@ -682,6 +681,7 @@
     "copy-webpack-plugin": "^6.0.2",
     "cpy": "^8.1.1",
     "css-loader": "^3.4.2",
+    "css-minimizer-webpack-plugin": "^1.3.0",
     "cypress": "^6.8.0",
     "cypress-cucumber-preprocessor": "^2.5.2",
     "cypress-multi-reporters": "^1.4.0",

packages/kbn-dev-utils/src/plugins/simple_kibana_platform_plugin_discovery.ts

@@ -9,6 +9,7 @@
 import Path from 'path';
 
 import globby from 'globby';
+import normalize from 'normalize-path';
 
 import { parseKibanaPlatformPlugin } from './parse_kibana_platform_plugin';
 
@@ -32,7 +33,7 @@ export function simpleKibanaPlatformPluginDiscovery(scanDirs: string[], pluginPa
       ),
       ...pluginPaths.map((path) => Path.resolve(path, `kibana.json`)),
     ])
-  );
+  ).map((path) => normalize(path));
 
   const manifestPaths = globby.sync(patterns, { absolute: true }).map((path) =>
     // absolute paths returned from globby are using normalize or

packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts

@@ -11,6 +11,7 @@ import Path from 'path';
 import { REPO_ROOT } from '@kbn/utils';
 import { run, createFailError, createFlagError } from '@kbn/dev-utils';
 import globby from 'globby';
+import normalize from 'normalize-path';
 
 import { getFailures, TestFailure } from './get_failures';
 import { GithubApi, GithubIssueMini } from './github_api';
@@ -61,7 +62,9 @@ export function runFailedTestsReporterCli() {
         throw createFlagError('Missing --build-url or process.env.BUILD_URL');
       }
 
-      const patterns = flags._.length ? flags._ : DEFAULT_PATTERNS;
+      const patterns = (flags._.length ? flags._ : DEFAULT_PATTERNS).map((p) =>
+        normalize(Path.resolve(p))
+      );
       log.info('Searching for reports at', patterns);
       const reportPaths = await globby(patterns, {
         absolute: true,

src/core/server/config/deprecation/core_deprecations.test.ts

@@ -6,27 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { configDeprecationFactory, applyDeprecations } from '@kbn/config';
+import { getDeprecationsForGlobalSettings } from '../test_utils';
 import { coreDeprecationProvider } from './core_deprecations';
-
 const initialEnv = { ...process.env };
 
-const applyCoreDeprecations = (settings: Record<string, any> = {}) => {
-  const deprecations = coreDeprecationProvider(configDeprecationFactory);
-  const deprecationMessages: string[] = [];
-  const migrated = applyDeprecations(
-    settings,
-    deprecations.map((deprecation) => ({
-      deprecation,
-      path: '',
-    })),
-    () => ({ message }) => deprecationMessages.push(message)
-  );
-  return {
-    messages: deprecationMessages,
-    migrated,
-  };
-};
+const applyCoreDeprecations = (settings?: Record<string, any>) =>
+  getDeprecationsForGlobalSettings({ provider: coreDeprecationProvider, settings });
 
 describe('core deprecations', () => {
   beforeEach(() => {

src/core/server/config/test_utils.ts

@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { ConfigDeprecationProvider } from '@kbn/config';
+import { configDeprecationFactory, applyDeprecations } from '@kbn/config';
+
+function collectDeprecations(
+  provider: ConfigDeprecationProvider,
+  settings: Record<string, any>,
+  path: string
+) {
+  const deprecations = provider(configDeprecationFactory);
+  const deprecationMessages: string[] = [];
+  const migrated = applyDeprecations(
+    settings,
+    deprecations.map((deprecation) => ({
+      deprecation,
+      path,
+    })),
+    () => ({ message }) => deprecationMessages.push(message)
+  );
+  return {
+    messages: deprecationMessages,
+    migrated,
+  };
+}
+
+export const getDeprecationsFor = ({
+  provider,
+  settings = {},
+  path,
+}: {
+  provider: ConfigDeprecationProvider;
+  settings?: Record<string, any>;
+  path: string;
+}) => {
+  return collectDeprecations(provider, { [path]: settings }, path);
+};
+
+export const getDeprecationsForGlobalSettings = ({
+  provider,
+  settings = {},
+}: {
+  provider: ConfigDeprecationProvider;
+  settings?: Record<string, any>;
+}) => {
+  return collectDeprecations(provider, settings, '');
+};

src/core/server/elasticsearch/elasticsearch_config.test.ts

@@ -12,29 +12,17 @@ import {
   mockReadPkcs12Truststore,
 } from './elasticsearch_config.test.mocks';
 
-import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
 import { ElasticsearchConfig, config } from './elasticsearch_config';
+import { getDeprecationsFor } from '../config/test_utils';
 
 const CONFIG_PATH = 'elasticsearch';
 
-const applyElasticsearchDeprecations = (settings: Record<string, any> = {}) => {
-  const deprecations = config.deprecations!(configDeprecationFactory);
-  const deprecationMessages: string[] = [];
-  const _config: any = {};
-  _config[CONFIG_PATH] = settings;
-  const migrated = applyDeprecations(
-    _config,
-    deprecations.map((deprecation) => ({
-      deprecation,
-      path: CONFIG_PATH,
-    })),
-    () => ({ message }) => deprecationMessages.push(message)
-  );
-  return {
-    messages: deprecationMessages,
-    migrated,
-  };
-};
+const applyElasticsearchDeprecations = (settings: Record<string, any> = {}) =>
+  getDeprecationsFor({
+    provider: config.deprecations!,
+    settings,
+    path: CONFIG_PATH,
+  });
 
 test('set correct defaults', () => {
   const configValue = new ElasticsearchConfig(config.schema.validate({}));

src/core/server/kibana_config.test.ts

@@ -7,28 +7,16 @@
  */
 
 import { config } from './kibana_config';
-import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
+import { getDeprecationsFor } from './config/test_utils';
 
 const CONFIG_PATH = 'kibana';
 
-const applyKibanaDeprecations = (settings: Record<string, any> = {}) => {
-  const deprecations = config.deprecations!(configDeprecationFactory);
-  const deprecationMessages: string[] = [];
-  const _config: any = {};
-  _config[CONFIG_PATH] = settings;
-  const migrated = applyDeprecations(
-    _config,
-    deprecations.map((deprecation) => ({
-      deprecation,
-      path: CONFIG_PATH,
-    })),
-    () => ({ message }) => deprecationMessages.push(message)
-  );
-  return {
-    messages: deprecationMessages,
-    migrated,
-  };
-};
+const applyKibanaDeprecations = (settings: Record<string, any> = {}) =>
+  getDeprecationsFor({
+    provider: config.deprecations!,
+    settings,
+    path: CONFIG_PATH,
+  });
 
 it('set correct defaults ', () => {
   const configValue = config.schema.validate({});