Merge branch 'master' into fix-alert-generator

Author: elasticmachine

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

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/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-dev-utils/src/proc_runner/observe_lines.ts renamed to packages/kbn-dev-utils/src/stdio/observe_lines.ts

@@ -1,9 +1,9 @@
 {
   "name": "@kbn/test",
-  "main": "./target/index.js",
   "version": "1.0.0",
-  "license": "Apache-2.0",
   "private": true,
+  "license": "Apache-2.0",
+  "main": "./target/index.js",
   "scripts": {
     "build": "babel src --out-dir target --delete-dir-on-start --extensions .ts,.js,.tsx --ignore *.test.js,**/__tests__/** --source-maps=inline",
     "kbn:bootstrap": "yarn build",
@@ -13,6 +13,7 @@
     "@babel/cli": "^7.10.1",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
+    "@types/joi": "^13.4.2",
     "@types/parse-link-header": "^1.0.0",
     "@types/puppeteer": "^3.0.0",
     "@types/strip-ansi": "^5.2.1",
@@ -23,12 +24,14 @@
     "chalk": "^2.4.2",
     "dedent": "^0.7.0",
     "del": "^5.1.0",
+    "exit-hook": "^2.2.0",
     "getopts": "^2.2.4",
     "glob": "^7.1.2",
+    "joi": "^13.5.2",
     "parse-link-header": "^1.0.1",
     "puppeteer": "^3.3.0",
-    "strip-ansi": "^5.2.0",
     "rxjs": "^6.5.3",
+    "strip-ansi": "^5.2.0",
     "tar-fs": "^1.16.3",
     "tmp": "^0.1.0",
     "xml2js": "^0.4.22",

packages/kbn-dev-utils/src/proc_runner/observe_readable.ts renamed to packages/kbn-dev-utils/src/stdio/observe_readable.ts

@@ -19,7 +19,10 @@
 
 import { resolve } from 'path';
 import { inspect } from 'util';
+
 import { run, createFlagError, Flags } from '@kbn/dev-utils';
+import exitHook from 'exit-hook';
+
 import { FunctionalTestRunner } from './functional_test_runner';
 
 const makeAbsolutePath = (v: string) => resolve(process.cwd(), v);
@@ -92,8 +95,7 @@ export function runFtrCli() {
           err instanceof Error ? err : new Error(`non-Error type rejection value: ${inspect(err)}`)
         )
       );
-      process.on('SIGTERM', () => teardown());
-      process.on('SIGINT', () => teardown());
+      exitHook(teardown);
 
       try {
         if (flags['test-stats']) {

packages/kbn-test/package.json

@@ -29,6 +29,7 @@ import {
   readProviderSpec,
   setupMocha,
   runTests,
+  DockerServersService,
   Config,
   SuiteTracker,
 } from './lib';
@@ -130,12 +131,19 @@ export class FunctionalTestRunner {
         throw new Error('No tests defined.');
       }
 
+      const dockerServers = new DockerServersService(
+        config.get('dockerServers'),
+        this.log,
+        this.lifecycle
+      );
+
       // base level services that functional_test_runner exposes
       const coreProviders = readProviderSpec('Service', {
         lifecycle: () => this.lifecycle,
         log: () => this.log,
         failureMetadata: () => this.failureMetadata,
         config: () => config,
+        dockerServers: () => dockerServers,
       });
 
       return await handler(config, coreProviders);

packages/kbn-test/src/functional_test_runner/cli.ts

@@ -20,3 +20,4 @@
 export { FunctionalTestRunner } from './functional_test_runner';
 export { readConfigFile } from './lib';
 export { runFtrCli } from './cli';
+export * from './lib/docker_servers';