Merge branch 'master' into 60659-alert-prefill

elastic · Jun 23, 2020 · d6200a1 · d6200a1
2 parents dd4eab4 + 0e2f9fc
commit d6200a1
Show file tree

Hide file tree

Showing 571 changed files with 8,957 additions and 7,532 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -41,7 +41,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
             'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
             'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
             'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
-            'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
+            // 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
             'xpack-securitySolutionCypress': { processNumber ->
               whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
                 kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)

diff --git a/docs/settings/ingest-manager-settings.asciidoc b/docs/settings/ingest-manager-settings.asciidoc
@@ -8,8 +8,10 @@
 experimental[]
 
 You can configure `xpack.ingestManager` settings in your `kibana.yml`. 
-By default, {ingest-manager} is not enabled. You need to enable it. To use
-{fleet}, you also need to configure {kib} and {es} hosts.
+By default, {ingest-manager} is not enabled. You need to
+enable it. To use {fleet}, you also need to configure {kib} and {es} hosts.
+
+See the {ingest-guide}/index.html[Ingest Management] docs for more information.
 
 [[general-ingest-manager-settings-kb]]
 ==== General {ingest-manager} settings

diff --git a/package.json b/package.json
@@ -259,7 +259,7 @@
     "reselect": "^4.0.0",
     "resize-observer-polyfill": "^1.5.0",
     "rison-node": "1.0.2",
-    "rxjs": "^6.5.3",
+    "rxjs": "^6.5.5",
     "script-loader": "0.7.2",
     "seedrandom": "^3.0.5",
     "semver": "^5.5.0",
@@ -346,7 +346,7 @@
     "@types/history": "^4.7.3",
     "@types/hoek": "^4.1.3",
     "@types/inert": "^5.1.2",
-    "@types/jest": "24.0.19",
+    "@types/jest": "^25.2.3",
     "@types/joi": "^13.4.2",
     "@types/jquery": "^3.3.31",
     "@types/js-yaml": "^3.11.1",
@@ -391,6 +391,7 @@
     "@types/supertest-as-promised": "^2.0.38",
     "@types/tar": "^4.0.3",
     "@types/testing-library__dom": "^6.10.0",
+    "@types/testing-library__jest-dom": "^5.7.0",
     "@types/testing-library__react": "^9.1.2",
     "@types/testing-library__react-hooks": "^3.1.0",
     "@types/type-detect": "^4.0.1",
@@ -403,7 +404,7 @@
     "archiver": "^3.1.1",
     "axe-core": "^3.4.1",
     "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.9.0",
+    "babel-jest": "^25.5.1",
     "babel-plugin-istanbul": "^6.0.0",
     "backport": "5.4.1",
     "chai": "3.5.0",
@@ -423,7 +424,7 @@
     "eslint-plugin-ban": "^1.4.0",
     "eslint-plugin-cypress": "^2.8.1",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-jest": "^23.3.0",
+    "eslint-plugin-jest": "^23.10.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-mocha": "^6.2.2",
     "eslint-plugin-no-unsanitized": "^3.0.2",
@@ -452,8 +453,10 @@
     "intl-messageformat-parser": "^1.4.0",
     "is-path-inside": "^2.1.0",
     "istanbul-instrumenter-loader": "3.0.1",
-    "jest": "^24.9.0",
-    "jest-cli": "^24.9.0",
+    "jest": "^25.5.4",
+    "jest-environment-jsdom-thirteen": "^1.0.1",
+    "jest-circus": "^25.5.4",
+    "jest-cli": "^25.5.4",
     "jest-raw-loader": "^1.0.1",
     "jimp": "^0.9.6",
     "json5": "^1.0.1",

diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
@@ -23,7 +23,7 @@
     "eslint-plugin-ban": "^1.4.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-jest": "^23.3.0",
+    "eslint-plugin-jest": "^23.10.0",
     "eslint-plugin-mocha": "^6.2.2",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-prefer-object-spread": "^1.2.1",

diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
@@ -18,7 +18,7 @@
     "getopts": "^2.2.5",
     "load-json-file": "^6.2.0",
     "moment": "^2.24.0",
-    "rxjs": "^6.5.3",
+    "rxjs": "^6.5.5",
     "tree-kill": "^1.2.2",
     "tslib": "^2.0.0"
   },

diff --git a/packages/kbn-dev-utils/src/index.ts b/packages/kbn-dev-utils/src/index.ts
@@ -37,4 +37,5 @@ export { run, createFailError, createFlagError, combineErrors, isFailError, Flag
 export { REPO_ROOT } from './repo_root';
 export { KbnClient } from './kbn_client';
 export * from './axios';
+export * from './stdio';
 export * from './ci_stats_reporter';
diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.ts b/packages/kbn-dev-utils/src/proc_runner/proc.ts
@@ -29,7 +29,7 @@ import { promisify } from 'util';
 const treeKillAsync = promisify((...args: [number, string, any]) => treeKill(...args));
 
 import { ToolingLog } from '../tooling_log';
-import { observeLines } from './observe_lines';
+import { observeLines } from '../stdio';
 import { createCliError } from './errors';
 
 const SECOND = 1000;

diff --git a/packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts b/packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts
@@ -21,7 +21,7 @@ import { REPO_ROOT } from '../repo_root';
 
 export function createAbsolutePathSerializer(rootPath: string = REPO_ROOT) {
   return {
-    print: (value: string) => value.replace(rootPath, '<absolute path>').replace(/\\/g, '/'),
+    serialize: (value: string) => value.replace(rootPath, '<absolute path>').replace(/\\/g, '/'),
     test: (value: any) => typeof value === 'string' && value.startsWith(rootPath),
   };
 }
diff --git a/packages/kbn-dev-utils/src/stdio/index.ts b/packages/kbn-dev-utils/src/stdio/index.ts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+export * from './observe_lines';
+export * from './observe_readable';
diff --git a/...ev-utils/src/proc_runner/observe_lines.ts → .../kbn-dev-utils/src/stdio/observe_lines.ts b/...ev-utils/src/proc_runner/observe_lines.ts → .../kbn-dev-utils/src/stdio/observe_lines.ts
diff --git a/...utils/src/proc_runner/observe_readable.ts → ...n-dev-utils/src/stdio/observe_readable.ts b/...utils/src/proc_runner/observe_readable.ts → ...n-dev-utils/src/stdio/observe_readable.ts
diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json
@@ -31,15 +31,15 @@
     "execa": "^4.0.2",
     "file-loader": "^4.2.0",
     "istanbul-instrumenter-loader": "^3.0.1",
-    "jest-diff": "^25.1.0",
+    "jest-diff": "^25.5.0",
     "json-stable-stringify": "^1.0.1",
     "loader-utils": "^1.2.3",
     "node-sass": "^4.13.0",
     "normalize-path": "^3.0.0",
     "postcss-loader": "^3.0.0",
     "raw-loader": "^3.1.0",
     "resolve-url-loader": "^3.1.1",
-    "rxjs": "^6.5.3",
+    "rxjs": "^6.5.5",
     "sass-loader": "^8.0.2",
     "style-loader": "^1.1.3",
     "terser-webpack-plugin": "^2.1.2",

diff --git a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
@@ -33,7 +33,7 @@ const MOCK_REPO_SRC = Path.resolve(__dirname, '../__fixtures__/mock_repo');
 const MOCK_REPO_DIR = Path.resolve(TMP_DIR, 'mock_repo');
 
 expect.addSnapshotSerializer({
-  print: (value: string) => value.split(REPO_ROOT).join('<absolute path>').replace(/\\/g, '/'),
+  serialize: (value: string) => value.split(REPO_ROOT).join('<absolute path>').replace(/\\/g, '/'),
   test: (value: any) => typeof value === 'string' && value.includes(REPO_ROOT),
 });