Merge branch 'master' into feat/ssource-fields

.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=12.19.1
+ARG NODE_VERSION=14.15.1
 
 FROM node:${NODE_VERSION} AS base
 

.node-version

@@ -1 +1 @@
-12.19.1
+14.15.1

.nvmrc

@@ -1 +1 @@
-12.19.1
+14.15.1

docs/api/logstash-configuration-management/create-logstash.asciidoc

@@ -20,9 +20,6 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
 [[logstash-configuration-management-api-create-request-body]]
 ==== Request body
 
-`id`::
-  (Required, string) The pipeline ID.
-
 `description`::
   (Optional, string) The pipeline description.
 

docs/developer/contributing/development-unit-tests.asciidoc

@@ -20,11 +20,13 @@ yarn test:mocha
 == Jest
 Jest tests are stored in the same directory as source code files with the `.test.{js,mjs,ts,tsx}` suffix.
 
-*Running Jest Unit Tests*
+Each plugin and package contains it's own `jest.config.js` file to define its root, and any overrides 
+to the jest-preset provided by `@kbn/test`. When working on a single plugin or package, you will find 
+it's more efficient to supply the Jest configuration file when running.
 
 ["source","shell"]
 -----------
-yarn test:jest
+yarn jest --config src/plugins/discover/jest.config.js
 -----------
 
 [discrete]

docs/developer/plugin-list.asciidoc

@@ -507,8 +507,8 @@ Kibana.
 |or
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/spaces[spaces]
-|WARNING: Missing README.
+|{kib-repo}blob/{branch}/x-pack/plugins/spaces/README.md[spaces]
+|See Configuring Kibana Spaces.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/stack_alerts/README.md[stackAlerts]

docs/settings/spaces-settings.asciidoc

@@ -16,6 +16,7 @@ roles when Security is enabled.
 |===
 | `xpack.spaces.enabled`
   | Set to `true` (default) to enable Spaces in {kib}.
+    This setting is deprecated. Starting in 8.0, it will not be possible to disable this plugin.
 
 | `xpack.spaces.maxSpaces`
   | The maximum amount of Spaces that can be used with this instance of {kib}. Some operations

src/dev/jest/config.integration.js → jest.config.integration.js

@@ -17,16 +17,14 @@
  * under the License.
  */
 
-import preset from '@kbn/test/jest-preset';
-import config from './config';
+const preset = require('@kbn/test/jest-preset');
 
-export default {
-  ...config,
-  testMatch: [
-    '**/integration_tests/**/*.test.js',
-    '**/integration_tests/**/*.test.ts',
-    '**/integration_tests/**/*.test.tsx',
-  ],
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '.',
+  roots: ['<rootDir>/src', '<rootDir>/packages'],
+  testMatch: ['**/integration_tests**/*.test.{js,mjs,ts,tsx}'],
+  testRunner: 'jasmine2',
   testPathIgnorePatterns: preset.testPathIgnorePatterns.filter(
     (pattern) => !pattern.includes('integration_tests')
   ),

jest.config.js

@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  rootDir: '.',
+  projects: [...require('./jest.config.oss').projects, ...require('./x-pack/jest.config').projects],
+};

jest.config.oss.js

@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  rootDir: '.',
+  projects: [
+    '<rootDir>/packages/*/jest.config.js',
+    '<rootDir>/src/*/jest.config.js',
+    '<rootDir>/src/legacy/*/jest.config.js',
+    '<rootDir>/src/plugins/*/jest.config.js',
+    '<rootDir>/test/*/jest.config.js',
+  ],
+  reporters: ['default', '<rootDir>/packages/kbn-test/target/jest/junit_reporter'],
+};

package.json

@@ -81,7 +81,7 @@
     "**/@types/hapi__boom": "^7.4.1",
     "**/@types/hapi__hapi": "^18.2.6",
     "**/@types/hapi__mimos": "4.1.0",
-    "**/@types/node": "12.19.4",
+    "**/@types/node": "14.14.7",
     "**/cross-fetch/node-fetch": "^2.6.1",
     "**/deepmerge": "^4.2.2",
     "**/fast-deep-equal": "^3.1.1",
@@ -98,18 +98,18 @@
     "**/typescript": "4.1.2"
   },
   "engines": {
-    "node": "12.19.1",
+    "node": "14.15.1",
     "yarn": "^1.21.1"
   },
   "dependencies": {
     "@babel/core": "^7.11.6",
     "@babel/runtime": "^7.11.2",
     "@elastic/datemath": "link:packages/elastic-datemath",
-    "@elastic/elasticsearch": "7.10.0-rc.1",
+    "@elastic/elasticsearch": "7.10.0",
     "@elastic/ems-client": "7.11.0",
     "@elastic/eui": "30.2.0",
     "@elastic/filesaver": "1.1.2",
-    "@elastic/good": "8.1.1-kibana2",
+    "@elastic/good": "^9.0.1-kibana3",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",
@@ -496,7 +496,7 @@
     "@types/mustache": "^0.8.31",
     "@types/ncp": "^2.0.1",
     "@types/nock": "^10.0.3",
-    "@types/node": "12.19.4",
+    "@types/node": "14.14.7",
     "@types/node-fetch": "^2.5.7",
     "@types/node-forge": "^0.9.5",
     "@types/nodemailer": "^6.4.0",
@@ -722,7 +722,7 @@
     "less": "npm:@elastic/[email protected]",
     "license-checker": "^16.0.0",
     "listr": "^0.14.1",
-    "lmdb-store": "^0.8.15",
+    "lmdb-store": "^0.9.0",
     "load-grunt-config": "^3.0.1",
     "loader-utils": "^1.2.3",
     "log-symbols": "^2.2.0",
@@ -805,7 +805,7 @@
     "sass-resources-loader": "^2.0.1",
     "selenium-webdriver": "^4.0.0-alpha.7",
     "serve-static": "1.14.1",
-    "shelljs": "^0.8.3",
+    "shelljs": "^0.8.4",
     "simple-git": "1.116.0",
     "sinon": "^7.4.2",
     "spawn-sync": "^1.0.15",

packages/README.md

@@ -60,7 +60,7 @@ A package can also follow the pattern of having `.test.js` files as siblings of
 A package using the `.test.js` naming convention will have those tests automatically picked up by Jest and run by the unit test runner, currently mapped to the Kibana `test` script in the root `package.json`.
 
 * `yarn test` or `yarn grunt test` runs all unit tests.
-* `node scripts/jest` runs all Jest tests in Kibana.
+* `yarn jest` runs all Jest tests in Kibana.
 
 ----
 Each package can also specify its own `test` script in the package's `package.json`, for cases where you'd prefer to run the tests from the local package directory.

packages/kbn-apm-config-loader/jest.config.js

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-apm-config-loader'],
+};

packages/kbn-babel-code-parser/jest.config.js

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-babel-code-parser'],
+};

packages/kbn-config-schema/jest.config.js

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-config-schema'],
+};

packages/kbn-config/jest.config.js

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-config'],
+};

packages/kbn-dev-utils/jest.config.js

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-dev-utils'],
+};

packages/kbn-es-archiver/jest.config.js

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-es-archiver'],
+};

packages/kbn-es/jest.config.js

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-es'],
+};