Merge remote-tracking branch 'upstream/master' into lens/value-in-legend

elastic · Jun 4, 2021 · d930d68 · d930d68
2 parents b717c05 + bc36318
commit d930d68
Show file tree

Hide file tree

Showing 331 changed files with 9,499 additions and 5,260 deletions.
diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -85,6 +85,7 @@ yarn kbn watch-bazel
 - @kbn/logging
 - @kbn/mapbox-gl
 - @kbn/monaco
+- @kbn/rule-data-utils
 - @kbn/securitysolution-es-utils
 - @kbn/securitysolution-io-ts-alerting-types
 - @kbn/securitysolution-io-ts-list-types

diff --git a/docs/maps/index.asciidoc b/docs/maps/index.asciidoc
@@ -24,8 +24,8 @@ Create beautiful maps from your geographical data. With **Maps**, you can:
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/BYzRDtH4u7RSD8wKhuEW1b.jpg"
-data-uuid="BYzRDtH4u7RSD8wKhuEW1b"
+src="https://play.vidyard.com/mBuWenQ2uSLY9YjEkPtzJC.jpg"
+data-uuid="mBuWenQ2uSLY9YjEkPtzJC"
 data-v="4"
 data-type="inline"
 />

diff --git a/docs/settings/fleet-settings.asciidoc b/docs/settings/fleet-settings.asciidoc
@@ -39,8 +39,8 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
 |===
 | `xpack.fleet.agents.fleet_server.hosts`
   | Hostnames used by {agent} for accessing {fleet-server}.
-| `xpack.fleet.agents.elasticsearch.host`
-  | The hostname used by {agent} for accessing {es}.
+| `xpack.fleet.agents.elasticsearch.hosts`
+  | Hostnames used by {agent} for accessing {es}.
 |===
 
 [NOTE]

diff --git a/docs/user/dashboard/lens.asciidoc b/docs/user/dashboard/lens.asciidoc
@@ -10,8 +10,8 @@ src="https://play.vidyard.com/embed/v4.js"></script>
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/G6RNjq6U9odYRCYUxY2vfq.jpg"
-data-uuid="G6RNjq6U9odYRCYUxY2vfq"
+src="https://play.vidyard.com/vVJ69WCgUwGNJSDqjPZbaV.jpg"
+data-uuid="vVJ69WCgUwGNJSDqjPZbaV"
 data-v="4"
 data-type="inline"
 />

diff --git a/docs/user/introduction.asciidoc b/docs/user/introduction.asciidoc
@@ -26,8 +26,8 @@ which features.
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/jW5wP2dmegbs5ThRZ451Gj.jpg"
-data-uuid="jW5wP2dmegbs5ThRZ451Gj"
+src="https://play.vidyard.com/iyqMwJcvi8r4YfjeoPMjyH.jpg"
+data-uuid="iyqMwJcvi8r4YfjeoPMjyH"
 data-v="4"
 data-type="inline"
 />

diff --git a/package.json b/package.json
@@ -100,7 +100,7 @@
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/apm-rum-react": "^1.2.5",
     "@elastic/charts": "29.2.0",
-    "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath/npm_module",
+    "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.4",
     "@elastic/ems-client": "7.13.0",
     "@elastic/eui": "33.0.0",
@@ -111,7 +111,7 @@
     "@elastic/numeral": "^2.5.1",
     "@elastic/react-search-ui": "^1.5.1",
     "@elastic/request-crypto": "1.1.4",
-    "@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set/npm_module",
+    "@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set",
     "@elastic/search-ui-app-search-connector": "^1.5.0",
     "@elastic/ui-ace": "0.2.3",
     "@hapi/accept": "^5.0.2",
@@ -124,39 +124,39 @@
     "@hapi/inert": "^6.0.3",
     "@hapi/podium": "^4.1.1",
     "@hapi/wreck": "^17.1.0",
-    "@kbn/ace": "link:bazel-bin/packages/kbn-ace/npm_module",
-    "@kbn/analytics": "link:bazel-bin/packages/kbn-analytics/npm_module",
-    "@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader/npm_module",
-    "@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils/npm_module",
-    "@kbn/config": "link:bazel-bin/packages/kbn-config/npm_module",
-    "@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema/npm_module",
-    "@kbn/crypto": "link:bazel-bin/packages/kbn-crypto/npm_module",
-    "@kbn/i18n": "link:bazel-bin/packages/kbn-i18n/npm_module",
+    "@kbn/ace": "link:bazel-bin/packages/kbn-ace",
+    "@kbn/analytics": "link:bazel-bin/packages/kbn-analytics",
+    "@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader",
+    "@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils",
+    "@kbn/config": "link:bazel-bin/packages/kbn-config",
+    "@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema",
+    "@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
+    "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl",
+    "@kbn/i18n": "link:bazel-bin/packages/kbn-i18n",
     "@kbn/interpreter": "link:packages/kbn-interpreter",
-    "@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils/npm_module",
-    "@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging/npm_module",
-    "@kbn/logging": "link:bazel-bin/packages/kbn-logging/npm_module",
-    "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module",
-    "@kbn/monaco": "link:bazel-bin/packages/kbn-monaco/npm_module",
-    "@kbn/rule-data-utils": "link:packages/kbn-rule-data-utils",
-    "@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils/npm_module",
-    "@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types/npm_module",
-    "@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types/npm_module",
-    "@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types/npm_module",
-    "@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils/npm_module",
-    "@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api/npm_module",
-    "@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants/npm_module",
-    "@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks/npm_module",
-    "@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils/npm_module",
-    "@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils/npm_module",
-    "@kbn/server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools/npm_module",
+    "@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils",
+    "@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging",
+    "@kbn/logging": "link:bazel-bin/packages/kbn-logging",
+    "@kbn/monaco": "link:bazel-bin/packages/kbn-monaco",
+    "@kbn/rule-data-utils": "link:bazel-bin/packages/kbn-rule-data-utils",
+    "@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants",
+    "@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils",
+    "@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types",
+    "@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types",
+    "@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types",
+    "@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils",
+    "@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api",
+    "@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks",
+    "@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils",
+    "@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils",
+    "@kbn/server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools",
     "@kbn/server-route-repository": "link:packages/kbn-server-route-repository",
-    "@kbn/std": "link:bazel-bin/packages/kbn-std/npm_module",
-    "@kbn/tinymath": "link:bazel-bin/packages/kbn-tinymath/npm_module",
+    "@kbn/std": "link:bazel-bin/packages/kbn-std",
+    "@kbn/tinymath": "link:bazel-bin/packages/kbn-tinymath",
     "@kbn/ui-framework": "link:packages/kbn-ui-framework",
     "@kbn/ui-shared-deps": "link:packages/kbn-ui-shared-deps",
-    "@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module",
-    "@kbn/utils": "link:bazel-bin/packages/kbn-utils/npm_module",
+    "@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types",
+    "@kbn/utils": "link:bazel-bin/packages/kbn-utils",
     "@loaders.gl/core": "^2.3.1",
     "@loaders.gl/json": "^2.3.1",
     "@mapbox/geojson-rewind": "^0.5.0",
@@ -241,7 +241,6 @@
     "get-port": "^5.0.0",
     "getopts": "^2.2.5",
     "getos": "^3.1.0",
-    "git-url-parse": "11.1.2",
     "github-markdown-css": "^2.10.0",
     "glob": "^7.1.2",
     "glob-all": "^3.2.1",
@@ -294,7 +293,7 @@
     "memoize-one": "^5.0.0",
     "mime": "^2.4.4",
     "mime-types": "^2.1.27",
-    "mini-css-extract-plugin": "0.8.0",
+    "mini-css-extract-plugin": "1.1.0",
     "minimatch": "^3.0.4",
     "moment": "^2.24.0",
     "moment-duration-format": "^2.3.2",
@@ -447,28 +446,28 @@
     "@cypress/webpack-preprocessor": "^5.6.0",
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/apm-rum-react": "^1.2.5",
-    "@elastic/eslint-config-kibana": "link:bazel-bin/packages/elastic-eslint-config-kibana/npm_module",
+    "@elastic/eslint-config-kibana": "link:bazel-bin/packages/elastic-eslint-config-kibana",
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
     "@elastic/makelogs": "^6.0.0",
     "@istanbuljs/schema": "^0.1.2",
     "@jest/reporters": "^26.6.2",
-    "@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser/npm_module",
-    "@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset/npm_module",
+    "@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser",
+    "@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset",
     "@kbn/cli-dev-mode": "link:packages/kbn-cli-dev-mode",
-    "@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils/npm_module",
-    "@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils/npm_module",
-    "@kbn/es": "link:bazel-bin/packages/kbn-es/npm_module",
+    "@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils",
+    "@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils",
+    "@kbn/es": "link:bazel-bin/packages/kbn-es",
     "@kbn/es-archiver": "link:packages/kbn-es-archiver",
-    "@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana/npm_module",
-    "@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint/npm_module",
-    "@kbn/expect": "link:bazel-bin/packages/kbn-expect/npm_module",
+    "@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana",
+    "@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint",
+    "@kbn/expect": "link:bazel-bin/packages/kbn-expect",
     "@kbn/optimizer": "link:packages/kbn-optimizer",
-    "@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator/npm_module",
+    "@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator",
     "@kbn/plugin-helpers": "link:packages/kbn-plugin-helpers",
     "@kbn/pm": "link:packages/kbn-pm",
     "@kbn/storybook": "link:packages/kbn-storybook",
-    "@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools/npm_module",
+    "@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools",
     "@kbn/test": "link:packages/kbn-test",
     "@kbn/test-subj-selector": "link:packages/kbn-test-subj-selector",
     "@loaders.gl/polyfills": "^2.3.5",
@@ -533,7 +532,6 @@
     "@types/geojson": "7946.0.7",
     "@types/getopts": "^2.0.1",
     "@types/getos": "^3.0.0",
-    "@types/git-url-parse": "^9.0.0",
     "@types/glob": "^7.1.2",
     "@types/gulp": "^4.0.6",
     "@types/gulp-zip": "^4.0.1",

diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -28,6 +28,7 @@ filegroup(
       "//packages/kbn-mapbox-gl:build",
       "//packages/kbn-monaco:build",
       "//packages/kbn-plugin-generator:build",
+      "//packages/kbn-rule-data-utils:build",
       "//packages/kbn-securitysolution-list-constants:build",
       "//packages/kbn-securitysolution-io-ts-types:build",
       "//packages/kbn-securitysolution-io-ts-alerting-types:build",

diff --git a/packages/kbn-babel-code-parser/BUILD.bazel b/packages/kbn-babel-code-parser/BUILD.bazel
@@ -34,10 +34,10 @@ DEPS = [
 
 babel(
   name = "target",
-  data = [
+  data = DEPS + [
       ":srcs",
       ".babelrc",
-  ] + DEPS,
+  ],
   output_dir = True,
   # the following arg paths includes $(execpath) as babel runs on the sandbox root
   args = [

diff --git a/packages/kbn-es/BUILD.bazel b/packages/kbn-es/BUILD.bazel
@@ -47,10 +47,10 @@ DEPS = [
 
 babel(
   name = "target",
-  data = [
+  data = DEPS + [
       ":srcs",
       ".babelrc",
-  ] + DEPS,
+  ],
   output_dir = True,
   # the following arg paths includes $(execpath) as babel runs on the sandbox root
   args = [

diff --git a/packages/kbn-expect/BUILD.bazel b/packages/kbn-expect/BUILD.bazel
@@ -5,7 +5,7 @@ PKG_REQUIRE_NAME = "@kbn/expect"
 
 SOURCE_FILES = glob([
   "expect.js",
-  "expect.js.d.ts",
+  "expect.d.ts",
 ])
 
 SRCS = SOURCE_FILES

diff --git a/packages/kbn-expect/expect.js.d.ts → packages/kbn-expect/expect.d.ts b/packages/kbn-expect/expect.js.d.ts → packages/kbn-expect/expect.d.ts
diff --git a/packages/kbn-expect/package.json b/packages/kbn-expect/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@kbn/expect",
   "main": "./expect.js",
+  "typings": "./expect.d.ts",
   "version": "1.0.0",
   "license": "MIT",
   "private": true,

diff --git a/packages/kbn-expect/tsconfig.json b/packages/kbn-expect/tsconfig.json
@@ -4,6 +4,6 @@
     "incremental": false,
   },
   "include": [
-    "expect.js.d.ts"
+    "expect.d.ts"
   ]
 }
diff --git a/packages/kbn-legacy-logging/BUILD.bazel b/packages/kbn-legacy-logging/BUILD.bazel
@@ -25,6 +25,7 @@ NPM_MODULE_EXTRA_FILES = [
 
 SRC_DEPS = [
   "//packages/kbn-config-schema",
+  "//packages/kbn-utils",
   "@npm//@elastic/numeral",
   "@npm//@hapi/hapi",
   "@npm//chokidar",

diff --git a/packages/kbn-monaco/BUILD.bazel b/packages/kbn-monaco/BUILD.bazel
@@ -48,7 +48,7 @@ webpack(
   name = "target_web",
   data = DEPS + [
     ":src",
-    ":webpack.config.js",
+    "webpack.config.js",
   ],
   output_dir = True,
   args = [
@@ -87,7 +87,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = DEPS + [":target_web", ":tsc"],
+  deps = DEPS + [":tsc", ":target_web"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )

diff --git a/packages/kbn-monaco/webpack.config.js b/packages/kbn-monaco/webpack.config.js
@@ -22,7 +22,6 @@ const createLangWorkerConfig = (lang) => {
       filename: `${lang}.editor.worker.js`,
     },
     resolve: {
-      modules: ['node_modules'],
       extensions: ['.js', '.ts', '.tsx'],
     },
     stats: 'errors-only',

diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
@@ -23045,7 +23045,7 @@ class Project {
 
   ensureValidProjectDependency(project) {
     const relativePathToProject = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, project.path));
-    const relativePathToProjectIfBazelPkg = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, `${__dirname}/../../../bazel-bin/packages/${path__WEBPACK_IMPORTED_MODULE_1___default.a.basename(project.path)}/npm_module`));
+    const relativePathToProjectIfBazelPkg = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, `${__dirname}/../../../bazel-bin/packages/${path__WEBPACK_IMPORTED_MODULE_1___default.a.basename(project.path)}`));
     const versionInPackageJson = this.allDependencies[project.name];
     const expectedVersionInPackageJson = `link:${relativePathToProject}`;
     const expectedVersionInPackageJsonIfBazelPkg = `link:${relativePathToProjectIfBazelPkg}`; // TODO: after introduce bazel to build all the packages and completely remove the support for kbn packages
@@ -23234,7 +23234,7 @@ function transformDependencies(dependencies = {}) {
     }
 
     if (isBazelPackageDependency(depVersion)) {
-      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:').replace('/npm_module', '');
+      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
       continue;
     }
 

diff --git a/packages/kbn-pm/src/utils/package_json.ts b/packages/kbn-pm/src/utils/package_json.ts
@@ -61,7 +61,7 @@ export function transformDependencies(dependencies: IPackageDependencies = {}) {
     }
 
     if (isBazelPackageDependency(depVersion)) {
-      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:').replace('/npm_module', '');
+      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
       continue;
     }
 

diff --git a/packages/kbn-pm/src/utils/project.ts b/packages/kbn-pm/src/utils/project.ts
@@ -94,7 +94,7 @@ export class Project {
     const relativePathToProjectIfBazelPkg = normalizePath(
       Path.relative(
         this.path,
-        `${__dirname}/../../../bazel-bin/packages/${Path.basename(project.path)}/npm_module`
+        `${__dirname}/../../../bazel-bin/packages/${Path.basename(project.path)}`
       )
     );