Merge branch 'master' into issue_64861

elastic · Aug 20, 2021 · bd33997 · bd33997
2 parents a54c6a7 + a8c2a43
commit bd33997
Show file tree

Hide file tree

Showing 789 changed files with 14,118 additions and 8,138 deletions.
diff --git a/.ci/ci_groups.yml b/.ci/ci_groups.yml
@@ -0,0 +1,29 @@
+root:
+ - ciGroup1
+ - ciGroup2
+ - ciGroup3
+ - ciGroup4
+ - ciGroup5
+ - ciGroup6
+ - ciGroup7
+ - ciGroup8
+ - ciGroup9
+ - ciGroup10
+ - ciGroup11
+ - ciGroup12
+
+xpack:
+ - ciGroup1
+ - ciGroup2
+ - ciGroup3
+ - ciGroup4
+ - ciGroup5
+ - ciGroup6
+ - ciGroup7
+ - ciGroup8
+ - ciGroup9
+ - ciGroup10
+ - ciGroup11
+ - ciGroup12
+ - ciGroup13
+ - ciGroupDocker
diff --git a/.ci/jobs.yml b/.ci/jobs.yml
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -29,9 +29,9 @@
 /src/plugins/vis_type_timelion/ @elastic/kibana-app
 /src/plugins/vis_type_timeseries/ @elastic/kibana-app
 /src/plugins/vis_type_vega/ @elastic/kibana-app
-/src/plugins/vis_type_vislib/ @elastic/kibana-app
-/src/plugins/vis_type_xy/ @elastic/kibana-app
-/src/plugins/vis_type_pie/ @elastic/kibana-app
+/src/plugins/vis_types/vislib/ @elastic/kibana-app
+/src/plugins/vis_types/xy/ @elastic/kibana-app
+/src/plugins/vis_types/pie/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
 /src/plugins/url_forwarding/ @elastic/kibana-app

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -63,9 +63,9 @@
  "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
  "visTypeTimeseries": "src/plugins/vis_type_timeseries",
  "visTypeVega": "src/plugins/vis_type_vega",
- "visTypeVislib": "src/plugins/vis_type_vislib",
- "visTypeXy": "src/plugins/vis_type_xy",
- "visTypePie": "src/plugins/vis_type_pie",
+ "visTypeVislib": "src/plugins/vis_types/vislib",
+ "visTypeXy": "src/plugins/vis_types/xy",
+ "visTypePie": "src/plugins/vis_types/pie",
  "visualizations": "src/plugins/visualizations",
  "visualize": "src/plugins/visualize",
  "apmOss": "src/plugins/apm_oss",

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -290,7 +290,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_pie[visTypePie]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/pie[visTypePie]
 |WARNING: Missing README.
 
 
@@ -314,11 +314,11 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_vislib[visTypeVislib]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/vislib[visTypeVislib]
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_xy[visTypeXy]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/xy[visTypeXy]
 |WARNING: Missing README.
 
 

diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
diff --git a/docs/settings/banners-settings.asciidoc b/docs/settings/banners-settings.asciidoc
@@ -14,25 +14,17 @@ You can configure the `xpack.banners` settings in your `kibana.yml` file.
 Banners are a https://www.elastic.co/subscriptions[subscription feature].
 ====
 
-[[general-banners-settings-kb]]
-==== General banner settings
+`xpack.banners.placement`::
+Set to `top` to display a banner above the Elastic header. Defaults to `disabled`.
 
-[cols="2*<"]
-|===
+`xpack.banners.textContent`::
+The text to display inside the banner, either plain text or Markdown.
 
-| `xpack.banners.placement`
-| Set to `top` to display a banner above the Elastic header. Defaults to `disabled`.
+`xpack.banners.textColor`::
+The color for the banner text. Defaults to `#8A6A0A`.
 
-| `xpack.banners.textContent`
-| The text to display inside the banner, either plain text or Markdown.
+`xpack.banners.backgroundColor`::
+The color of the banner background. Defaults to `#FFF9E8`.
 
-| `xpack.banners.textColor`
-| The color for the banner text. Defaults to `#8A6A0A`.
-
-| `xpack.banners.backgroundColor`
-| The color of the banner background. Defaults to `#FFF9E8`.
-
-| `xpack.banners.disableSpaceBanners`
-| If true, per-space banner overrides will be disabled. Defaults to `false`.
-
-|===
+`xpack.banners.disableSpaceBanners`::
+If true, per-space banner overrides will be disabled. Defaults to `false`.
diff --git a/docs/settings/dev-settings.asciidoc b/docs/settings/dev-settings.asciidoc
@@ -12,31 +12,20 @@ They are enabled by default.
 [[grok-settings]]
 ==== Grok Debugger settings
 
-[cols="2*<"]
-|===
-| `xpack.grokdebugger.enabled` {ess-icon}
- | Set to `true` to enable the <<xpack-grokdebugger,Grok Debugger>>. Defaults to `true`.
+`xpack.grokdebugger.enabled` {ess-icon}::
+Set to `true` to enable the <<xpack-grokdebugger,Grok Debugger>>. Defaults to `true`.
 
-|===
 
 [float]
 [[profiler-settings]]
 ==== {searchprofiler} settings
 
-[cols="2*<"]
-|===
-| `xpack.searchprofiler.enabled`
- | Set to `true` to enable the <<xpack-profiler,{searchprofiler}>>. Defaults to `true`.
-
-|===
+`xpack.searchprofiler.enabled`::
+Set to `true` to enable the <<xpack-profiler,{searchprofiler}>>. Defaults to `true`.
 
 [float]
 [[painless_lab-settings]]
 ==== Painless Lab settings
 
-[cols="2*<"]
-|===
-| `xpack.painless_lab.enabled`
- | When set to `true`, enables the <<painlesslab, Painless Lab>>. Defaults to `true`.
-
-|===
+`xpack.painless_lab.enabled`::
+When set to `true`, enables the <<painlesslab, Painless Lab>>. Defaults to `true`.
diff --git a/docs/settings/graph-settings.asciidoc b/docs/settings/graph-settings.asciidoc
@@ -7,13 +7,5 @@
 
 You do not need to configure any settings to use the {graph-features}.
 
-[float]
-[[general-graph-settings]]
-==== General graph settings
-
-[cols="2*<"]
-|===
-| `xpack.graph.enabled` {ess-icon}
- | Set to `false` to disable the {graph-features}.
-
-|===
+`xpack.graph.enabled` {ess-icon}::
+Set to `false` to disable the {graph-features}.
diff --git a/docs/settings/monitoring-settings.asciidoc b/docs/settings/monitoring-settings.asciidoc
@@ -37,6 +37,10 @@ For more information, see
  monitoring back-end does not run and {kib} stats are not sent to the monitoring
  cluster.
 
+| `monitoring.ui.ccs.enabled`
+ | Set to `true` (default) to enable {ref}/modules-cross-cluster-search.html[cross-cluster search] of your monitoring data. The {ref}/modules-remote-clusters.html#remote-cluster-settings[`remote_cluster_client`] role must exist on each node.
+
+
 | `monitoring.ui.elasticsearch.hosts`
  | Specifies the location of the {es} cluster where your monitoring data is stored.
  By default, this is the same as <<elasticsearch-hosts, `elasticsearch.hosts`>>. This setting enables

diff --git a/jest.config.js b/jest.config.js
@@ -13,6 +13,7 @@ module.exports = {
  '<rootDir>/packages/*/jest.config.js',
  '<rootDir>/src/*/jest.config.js',
  '<rootDir>/src/plugins/*/jest.config.js',
+ '<rootDir>/src/plugins/vis_types/*/jest.config.js',
  '<rootDir>/test/*/jest.config.js',
  '<rootDir>/x-pack/plugins/*/jest.config.js',
  ],

diff --git a/package.json b/package.json
@@ -95,7 +95,7 @@
  "dependencies": {
  "@elastic/apm-rum": "^5.8.0",
  "@elastic/apm-rum-react": "^1.2.11",
- "@elastic/charts": "34.0.0",
+ "@elastic/charts": "34.1.1",
  "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
  "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.17",
  "@elastic/ems-client": "7.15.0",

diff --git a/packages/kbn-config/src/config_service.test.ts b/packages/kbn-config/src/config_service.test.ts
@@ -13,7 +13,7 @@ import { mockApplyDeprecations, mockedChangedPaths } from './config_service.test
 import { rawConfigServiceMock } from './raw/raw_config_service.mock';
 
 import { schema } from '@kbn/config-schema';
-import { MockedLogger, loggerMock } from '@kbn/logging/target/mocks';
+import { MockedLogger, loggerMock } from '@kbn/logging/mocks';
 
 import { ConfigService, Env, RawPackageInfo } from '.';
 

diff --git a/packages/kbn-interpreter/.babelrc b/packages/kbn-interpreter/.babelrc
@@ -0,0 +1,3 @@
+{
+ "presets": ["@kbn/babel-preset/node_preset"]
+}
diff --git a/packages/kbn-interpreter/BUILD.bazel b/packages/kbn-interpreter/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
 load("@npm//peggy:index.bzl", "peggy")
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler")
 
 PKG_BASE_NAME = "kbn-interpreter"
 PKG_REQUIRE_NAME = "@kbn/interpreter"
@@ -25,7 +26,7 @@ NPM_MODULE_EXTRA_FILES = [
  "package.json",
 ]
 
-SRC_DEPS = [
+RUNTIME_DEPS = [
  "@npm//lodash",
 ]
 
@@ -35,7 +36,11 @@ TYPES_DEPS = [
  "@npm//@types/node",
 ]
 
-DEPS = SRC_DEPS + TYPES_DEPS
+jsts_transpiler(
+ name = "target_node",
+ srcs = SRCS,
+ build_pkg_name = package_name(),
+)
 
 peggy(
  name = "grammar",
@@ -62,14 +67,15 @@ ts_config(
 )
 
 ts_project(
- name = "tsc",
+ name = "tsc_types",
  args = ['--pretty'],
  srcs = SRCS,
- deps = DEPS,
+ deps = TYPES_DEPS,
  allow_js = True,
  declaration = True,
  declaration_map = True,
- out_dir = "target",
+ emit_declaration_only = True,
+ out_dir = "target_types",
  source_map = True,
  root_dir = "src",
  tsconfig = ":tsconfig",
@@ -78,7 +84,7 @@ ts_project(
 js_library(
  name = PKG_BASE_NAME,
  srcs = NPM_MODULE_EXTRA_FILES + [":grammar"],
- deps = DEPS + [":tsc"],
+ deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
  package_name = PKG_REQUIRE_NAME,
  visibility = ["//visibility:public"],
 )

diff --git a/packages/kbn-interpreter/common/package.json b/packages/kbn-interpreter/common/package.json
@@ -1,5 +1,5 @@
 {
  "private": true,
- "main": "../target/common/index.js",
- "types": "../target/common/index.d.ts"
+ "main": "../target_node/common/index.js",
+ "types": "../target_types/common/index.d.ts"
 }
diff --git a/packages/kbn-interpreter/src/common/lib/ast.from_expression.test.js b/packages/kbn-interpreter/src/common/lib/ast.from_expression.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fromExpression } from '@kbn/interpreter/target/common/lib/ast';
+import { fromExpression } from '@kbn/interpreter/common';
 import { getType } from './get_type';
 
 describe('ast fromExpression', () => {

diff --git a/packages/kbn-interpreter/tsconfig.json b/packages/kbn-interpreter/tsconfig.json
@@ -2,9 +2,10 @@
  "extends": "../../tsconfig.bazel.json",
  "compilerOptions": {
  "allowJs": true,
- "outDir": "./target/types",
  "declaration": true,
  "declarationMap": true,
+ "emitDeclarationOnly": true,
+ "outDir": "./target_types",
  "rootDir": "src",
  "sourceMap": true,
  "sourceRoot": "../../../../packages/kbn-interpreter/src",

diff --git a/packages/kbn-logging/.babelrc b/packages/kbn-logging/.babelrc
@@ -0,0 +1,3 @@
+{
+ "presets": ["@kbn/babel-preset/node_preset"]
+}