Merge branch 'master' of github.com:elastic/kibana into ilm/basic-a11…

…y-tests * 'master' of github.com:elastic/kibana: (31 commits) [Discover] Add grid flyout jest test (elastic#89088) [Search Sessions] Improve session restoration back button (elastic#87635) [TSVB] Remove vis_type_timeseries_enhanced plugin (elastic#89274) [Security Solution] Init Osquery plugin (elastic#87109) [Fleet] Do not defined aliases inside datastream template (elastic#89512) skip flaky suite (elastic#86950) chore(NA): bazel machinery installation on kbn bootstrap (elastic#89469) [build/docker] Add support for centos ARM builds (elastic#84831) Convert default_watch.json to a JS object in order to avoid TS complaints (elastic#89488) [CI] Decrease number of Jest workers (elastic#89504) [Maps] remove maps_oss TS project (elastic#89502) Adds migration settings to Docker (elastic#89501) [Lens] Fix crash in transition from unique count to last value (elastic#88916) [kbn-es] Always use bundled JDK when starting Elasticsearch (elastic#89437) unskip getting_started/shakespeare test elasticsearch 64016 (elastic#89346) [Maps] migrate maps, maps_file_upload, and maps_legacy_licensing to TS projects (elastic#89439) skip flaky suite (elastic#89478) skip flaky suite (elastic#89476) skip flaky suite (elastic#89477) skip flaky suite (elastic#89475) ... # Conflicts: # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
jloleysens · Jan 28, 2021 · e814056 · e814056
2 parents 07618b2 + 457f011
commit e814056
Show file tree

Hide file tree

Showing 406 changed files with 10,004 additions and 3,954 deletions.
diff --git a/.bazeliskversion b/.bazeliskversion
@@ -0,0 +1 @@
+1.7.3
diff --git a/.bazelversion b/.bazelversion
@@ -0,0 +1 @@
+4.0.0
diff --git a/.ci/teamcity/oss/jest.sh b/.ci/teamcity/oss/jest.sh
@@ -10,4 +10,4 @@ source "$(dirname "${0}")/../util.sh"
 export JOB=kibana-oss-jest
 
 checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --verbose
+  node scripts/jest --ci --maxWorkers=5 --verbose
diff --git a/.ci/teamcity/tests/jest.sh b/.ci/teamcity/tests/jest.sh
@@ -7,4 +7,4 @@ source "$(dirname "${0}")/../util.sh"
 export JOB=kibana-jest
 
 checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --verbose --coverage
+  node scripts/jest --ci --maxWorkers=5 --verbose
diff --git a/.ci/teamcity/tests/test_projects.sh b/.ci/teamcity/tests/test_projects.sh
@@ -5,4 +5,4 @@ set -euo pipefail
 source "$(dirname "${0}")/../util.sh"
 
 checks-reporter-with-killswitch "Test Projects" \
-  yarn kbn run test --exclude kibana --oss --skip-kibana-plugins
+  yarn kbn run test --exclude kibana --oss --skip-kibana-plugins --skip-missing
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1192,6 +1192,32 @@ module.exports = {
       },
     },
 
+    /**
+     * Osquery overrides
+     */
+    {
+      extends: ['eslint:recommended', 'plugin:react/recommended'],
+      plugins: ['react'],
+      files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
+      rules: {
+        'arrow-body-style': ['error', 'as-needed'],
+        'prefer-arrow-callback': 'error',
+        'no-unused-vars': 'off',
+        'react/prop-types': 'off',
+      },
+    },
+    {
+      // typescript and javascript for front end react performance
+      files: ['x-pack/plugins/osquery/public/**/!(*.test).{js,mjs,ts,tsx}'],
+      plugins: ['react', 'react-perf'],
+      rules: {
+        'react-perf/jsx-no-new-object-as-prop': 'error',
+        'react-perf/jsx-no-new-array-as-prop': 'error',
+        'react-perf/jsx-no-new-function-as-prop': 'error',
+        'react/jsx-no-bind': 'error',
+      },
+    },
+
     /**
      * Prettier disables all conflicting rules, listing as last override so it takes precedence
      */

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,7 +9,6 @@
 /x-pack/plugins/discover_enhanced/ @elastic/kibana-app
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
-/x-pack/plugins/vis_type_timeseries_enhanced/ @elastic/kibana-app
 /src/plugins/advanced_settings/ @elastic/kibana-app
 /src/plugins/charts/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
@@ -330,6 +329,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
 
+# Security Asset Management
+/x-pack/plugins/osquery @elastic/security-asset-management
+
 # Design (at the bottom for specificity of SASS files)
 **/*.scss  @elastic/kibana-design
 #CC# /packages/kbn-ui-framework/ @elastic/kibana-design

diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -0,0 +1,3 @@
+workspace(
+    name = "kibana",
+)
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -460,6 +460,10 @@ Elastic.
 |This plugin provides shared components and services for use across observability solutions, as well as the observability landing page UI.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/osquery/README.md[osquery]
+|This plugin adds extended support to Security Solution Fleet Osquery integration
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/painless_lab/README.md[painlessLab]
 |This plugin helps users learn how to use the Painless scripting language.
 
@@ -555,10 +559,6 @@ in their infrastructure.
 |NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/vis_type_timeseries_enhanced/README.md[visTypeTimeseriesEnhanced]
-|The vis_type_timeseries_enhanced plugin is the x-pack counterpart to the OSS vis_type_timeseries plugin.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/watcher/README.md[watcher]
 |This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
 

diff --git a/...ana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.cancel.md b/...ana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.cancel.md
diff --git a/...bana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.flush.md b/...bana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.flush.md
diff --git a/...in-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.kbnurlcontrols.md b/...in-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.kbnurlcontrols.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-kibana\_utils-public-state\_sync](./kibana-plugin-plugins-kibana_utils-public-state_sync.md) &gt; [IKbnUrlStateStorage](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.md) &gt; [kbnUrlControls](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.kbnurlcontrols.md)
+
+## IKbnUrlStateStorage.kbnUrlControls property
+
+Lower level wrapper around history library that handles batching multiple URL updates into one history change
+
+<b>Signature:</b>
+
+```typescript
+kbnUrlControls: IKbnUrlControls;
+```
diff --git a/...ync/kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.md b/...ync/kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.md
@@ -20,9 +20,8 @@ export interface IKbnUrlStateStorage extends IStateStorage
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [cancel](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.cancel.md) | <code>() =&gt; void</code> | cancels any pending url updates |
 |  [change$](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.change_.md) | <code>&lt;State = unknown&gt;(key: string) =&gt; Observable&lt;State &#124; null&gt;</code> |  |
-|  [flush](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.flush.md) | <code>(opts?: {</code><br/><code>        replace?: boolean;</code><br/><code>    }) =&gt; boolean</code> | Synchronously runs any pending url updates, returned boolean indicates if change occurred. |
 |  [get](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.get.md) | <code>&lt;State = unknown&gt;(key: string) =&gt; State &#124; null</code> |  |
+|  [kbnUrlControls](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.kbnurlcontrols.md) | <code>IKbnUrlControls</code> | Lower level wrapper around history library that handles batching multiple URL updates into one history change |
 |  [set](./kibana-plugin-plugins-kibana_utils-public-state_sync.ikbnurlstatestorage.set.md) | <code>&lt;State&gt;(key: string, state: State, opts?: {</code><br/><code>        replace: boolean;</code><br/><code>    }) =&gt; Promise&lt;string &#124; undefined&gt;</code> |  |
 
diff --git a/docs/maps/maps-aggregations.asciidoc b/docs/maps/maps-aggregations.asciidoc
@@ -98,6 +98,13 @@ Point to point uses an {es} {ref}/search-aggregations-bucket-terms-aggregation.h
 Then, a nested {ref}/search-aggregations-bucket-geotilegrid-aggregation.html[GeoTile grid aggregation] groups sources for each destination into grids.
 A line connects each source grid centroid to each destination.
 
+Point-to-point layers are used in several common use cases:
+
+* Source-destination maps for network traffic
+* Origin-destination maps for flight data
+* Origin-destination flows for import/export/migration
+* Origin-destination for pick-up/drop-off data
+
 image::maps/images/point_to_point.png[]
 
 [role="xpack"]

diff --git a/package.json b/package.json
@@ -346,6 +346,7 @@
     "@babel/register": "^7.12.10",
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
+    "@bazel/ibazel": "^0.14.0",
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.5.0",
     "@elastic/apm-rum": "^5.6.1",

diff --git a/packages/kbn-es/package.json b/packages/kbn-es/package.json
@@ -8,6 +8,7 @@
     "devOnly": true
   },
   "scripts": {
+    "build": "node scripts/build",
     "kbn:bootstrap": "node scripts/build",
     "kbn:watch": "node scripts/build --watch"
   },

diff --git a/packages/kbn-es/src/cli_commands/snapshot.js b/packages/kbn-es/src/cli_commands/snapshot.js
@@ -62,8 +62,6 @@ exports.run = async (defaults = {}) => {
       await cluster.extractDataDirectory(installPath, options.dataArchive);
     }
 
-    options.bundledJDK = true;
-
     await cluster.run(installPath, options);
   }
 };
diff --git a/packages/kbn-es/src/cluster.js b/packages/kbn-es/src/cluster.js
@@ -279,7 +279,7 @@ exports.Cluster = class Cluster {
       env: {
         ...(installPath ? { ES_TMPDIR: path.resolve(installPath, 'ES_TMPDIR') } : {}),
         ...process.env,
-        ...(options.bundledJDK ? { JAVA_HOME: '' } : {}),
+        JAVA_HOME: '', // By default, we want to always unset JAVA_HOME so that the bundled JDK will be used
         ...(options.esEnvVars || {}),
       },
       stdio: ['ignore', 'pipe', 'pipe'],

diff --git a/packages/kbn-es/src/install/archive.js b/packages/kbn-es/src/install/archive.js
@@ -34,7 +34,6 @@ exports.installArchive = async function installArchive(archive, options = {}) {
     basePath = BASE_PATH,
     installPath = path.resolve(basePath, path.basename(archive, '.tar.gz')),
     log = defaultLog,
-    bundledJDK = false,
     esArgs = [],
   } = options;
 
@@ -64,7 +63,7 @@ exports.installArchive = async function installArchive(archive, options = {}) {
     await appendToConfig(installPath, 'xpack.security.enabled', 'true');
 
     await appendToConfig(installPath, 'xpack.license.self_generated.type', license);
-    await configureKeystore(installPath, log, bundledJDK, [
+    await configureKeystore(installPath, log, [
       ['bootstrap.password', password],
       ...parseSettings(esArgs, { filter: SettingsFilter.SecureOnly }),
     ]);
@@ -89,20 +88,11 @@ async function appendToConfig(installPath, key, value) {
  *
  * @param {String} installPath
  * @param {ToolingLog} log
- * @param {boolean} bundledJDK
  * @param {Array<[string, string]>} secureSettings List of custom Elasticsearch secure settings to
  * add into the keystore.
  */
-async function configureKeystore(
-  installPath,
-  log = defaultLog,
-  bundledJDK = false,
-  secureSettings
-) {
-  const env = {};
-  if (bundledJDK) {
-    env.JAVA_HOME = '';
-  }
+async function configureKeystore(installPath, log = defaultLog, secureSettings) {
+  const env = { JAVA_HOME: '' };
   await execa(ES_KEYSTORE_BIN, ['create'], { cwd: installPath, env });
 
   for (const [secureSettingName, secureSettingValue] of secureSettings) {

diff --git a/packages/kbn-es/src/install/snapshot.js b/packages/kbn-es/src/install/snapshot.js
@@ -61,7 +61,6 @@ exports.installSnapshot = async function installSnapshot({
   basePath = BASE_PATH,
   installPath = path.resolve(basePath, version),
   log = defaultLog,
-  bundledJDK = true,
   esArgs,
 }) {
   const { downloadPath } = await exports.downloadSnapshot({
@@ -78,7 +77,6 @@ exports.installSnapshot = async function installSnapshot({
     basePath,
     installPath,
     log,
-    bundledJDK,
     esArgs,
   });
 };
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -103,4 +103,5 @@ pageLoadAssetSize:
   stackAlerts: 29684
   presentationUtil: 28545
   spacesOss: 18817
+  osquery: 107090
   mapsFileUpload: 23775
diff --git a/packages/kbn-pm/README.md b/packages/kbn-pm/README.md
@@ -150,14 +150,14 @@ e.g. `build` or `test`. Instead of jumping into each package and running
 `yarn build` you can run:
 
 ```
-yarn kbn run build
+yarn kbn run build --skip-missing
 ```
 
 And if needed, you can skip packages in the same way as for bootstrapping, e.g.
 with `--exclude` and `--skip-kibana-plugins`:
 
 ```
-yarn kbn run build --exclude kibana
+yarn kbn run build --exclude kibana --skip-missing
 ```
 
 ### Watching