Skip to content

Commit b3a7dfd

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into better-pipe
2 parents 2c603ea + 23dccb7 commit b3a7dfd

653 files changed

Lines changed: 12145 additions & 11091 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=12.19.1
4+
ARG NODE_VERSION=14.15.1
55

66
FROM node:${NODE_VERSION} AS base
77

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.1
1+
14.15.1

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.1
1+
14.15.1

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
2020
[[logstash-configuration-management-api-create-request-body]]
2121
==== Request body
2222

23-
`id`::
24-
(Required, string) The pipeline ID.
25-
2623
`description`::
2724
(Optional, string) The pipeline description.
2825

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ yarn test:mocha
2020
== Jest
2121
Jest tests are stored in the same directory as source code files with the `.test.{js,mjs,ts,tsx}` suffix.
2222

23-
*Running Jest Unit Tests*
23+
Each plugin and package contains it's own `jest.config.js` file to define its root, and any overrides
24+
to the jest-preset provided by `@kbn/test`. When working on a single plugin or package, you will find
25+
it's more efficient to supply the Jest configuration file when running.
2426

2527
["source","shell"]
2628
-----------
27-
yarn test:jest
29+
yarn jest --config src/plugins/discover/jest.config.js
2830
-----------
2931

3032
[discrete]

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,8 @@ Kibana.
507507
|or
508508
509509
510-
|{kib-repo}blob/{branch}/x-pack/plugins/spaces[spaces]
511-
|WARNING: Missing README.
510+
|{kib-repo}blob/{branch}/x-pack/plugins/spaces/README.md[spaces]
511+
|See Configuring Kibana Spaces.
512512
513513
514514
|{kib-repo}blob/{branch}/x-pack/plugins/stack_alerts/README.md[stackAlerts]

‎docs/settings/spaces-settings.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ roles when Security is enabled.
1616
|===
1717
| `xpack.spaces.enabled`
1818
| Set to `true` (default) to enable Spaces in {kib}.
19+
This setting is deprecated. Starting in 8.0, it will not be possible to disable this plugin.
1920

2021
| `xpack.spaces.maxSpaces`
2122
| The maximum amount of Spaces that can be used with this instance of {kib}. Some operations

src/dev/jest/config.integration.js renamed to jest.config.integration.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
import preset from '@kbn/test/jest-preset';
21-
import config from './config';
20+
const preset = require('@kbn/test/jest-preset');
2221

23-
export default {
24-
...config,
25-
testMatch: [
26-
'**/integration_tests/**/*.test.js',
27-
'**/integration_tests/**/*.test.ts',
28-
'**/integration_tests/**/*.test.tsx',
29-
],
22+
module.exports = {
23+
preset: '@kbn/test',
24+
rootDir: '.',
25+
roots: ['<rootDir>/src', '<rootDir>/packages'],
26+
testMatch: ['**/integration_tests**/*.test.{js,mjs,ts,tsx}'],
27+
testRunner: 'jasmine2',
3028
testPathIgnorePatterns: preset.testPathIgnorePatterns.filter(
3129
(pattern) => !pattern.includes('integration_tests')
3230
),

‎jest.config.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
module.exports = {
21+
rootDir: '.',
22+
projects: [...require('./jest.config.oss').projects, ...require('./x-pack/jest.config').projects],
23+
};

‎jest.config.oss.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
module.exports = {
21+
rootDir: '.',
22+
projects: [
23+
'<rootDir>/packages/*/jest.config.js',
24+
'<rootDir>/src/*/jest.config.js',
25+
'<rootDir>/src/legacy/*/jest.config.js',
26+
'<rootDir>/src/plugins/*/jest.config.js',
27+
'<rootDir>/test/*/jest.config.js',
28+
],
29+
reporters: ['default', '<rootDir>/packages/kbn-test/target/jest/junit_reporter'],
30+
};

0 commit comments

Comments
 (0)