Merge branch '7.x' into backport/7.x/pr-69554

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)

NOTICE.txt

@@ -29,6 +29,68 @@ Author Tobias Koppers @sokra
 ---
 This product has relied on ASTExplorer that is licensed under MIT.
 
+---
+This product includes code that is based on Ace editor, which was available
+under a "BSD" license.
+
+Distributed under the BSD license:
+
+Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Ajax.org B.V. nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+This product includes code that is based on Ace editor, which was available
+under a "BSD" license.
+
+Distributed under the BSD license:
+
+Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Ajax.org B.V. nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ---
 This product includes code that is based on flot-charts, which was available
 under a "MIT" license.

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

package.json

@@ -256,7 +256,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",
@@ -341,7 +341,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",
@@ -386,6 +386,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",
@@ -398,8 +399,9 @@
  "archiver": "^3.1.1",
  "axe-core": "^3.4.1",
  "babel-eslint": "^10.0.3",
- "babel-jest": "^24.9.0",
- "backport": "4.9.0",
+ "babel-jest": "^25.5.1",
+ "babel-plugin-istanbul": "^6.0.0",
+ "backport": "5.4.1",
  "chai": "3.5.0",
  "chance": "1.0.18",
  "cheerio": "0.22.0",
@@ -417,7 +419,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",
@@ -446,8 +448,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",

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",

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"
  },

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';

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;

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),
  };
 }

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';

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",

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),
 });