Merge branch 'master' into feat/remove-disableable-plugins

.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=14.17.6
+ARG NODE_VERSION=16.11.1
 
 FROM node:${NODE_VERSION} AS base
 
@@ -10,7 +10,7 @@ RUN apt-get update && \
       libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
       libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
       libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
-      libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget openjdk-8-jre && \
+      libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget openjdk-11-jre && \
     rm -rf /var/lib/apt/lists/*
 
 RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \

.node-version

@@ -1 +1 @@
-14.17.6
+16.11.1

.nvmrc

@@ -1 +1 @@
-14.17.6
+16.11.1

WORKSPACE.bazel

@@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.8.0")
 # we can update that rule.
 node_repositories(
   node_repositories = {
-    "14.17.6-darwin_amd64": ("node-v14.17.6-darwin-x64.tar.gz", "node-v14.17.6-darwin-x64", "e3e4c02240d74fb1dc8a514daa62e5de04f7eaee0bcbca06a366ece73a52ad88"),
-    "14.17.6-linux_arm64": ("node-v14.17.6-linux-arm64.tar.xz", "node-v14.17.6-linux-arm64", "9c4f3a651e03cd9b5bddd33a80e8be6a6eb15e518513e410bb0852a658699156"),
-    "14.17.6-linux_s390x": ("node-v14.17.6-linux-s390x.tar.xz", "node-v14.17.6-linux-s390x", "3677f35b97608056013b5368f86eecdb044bdccc1b3976c1d4448736c37b6a0c"),
-    "14.17.6-linux_amd64": ("node-v14.17.6-linux-x64.tar.xz", "node-v14.17.6-linux-x64", "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b"),
-    "14.17.6-windows_amd64": ("node-v14.17.6-win-x64.zip", "node-v14.17.6-win-x64", "b83e9ce542fda7fc519cec6eb24a2575a84862ea4227dedc171a8e0b5b614ac0"),
+    "16.11.1-darwin_amd64": ("node-v16.11.1-darwin-x64.tar.gz", "node-v16.11.1-darwin-x64", "ba54b8ed504bd934d03eb860fefe991419b4209824280d4274f6a911588b5e45"),
+    "16.11.1-linux_arm64": ("node-v16.11.1-linux-arm64.tar.xz", "node-v16.11.1-linux-arm64", "083fc51f0ea26de9041aaf9821874651a9fd3b20d1cf57071ce6b523a0436f17"),
+    "16.11.1-linux_s390x": ("node-v16.11.1-linux-s390x.tar.xz", "node-v16.11.1-linux-s390x", "855b5c83c2ccb05273d50bb04376335c68d47df57f3187cdebe1f22b972d2825"),
+    "16.11.1-linux_amd64": ("node-v16.11.1-linux-x64.tar.xz", "node-v16.11.1-linux-x64", "493bcc9b660eff983a6de65a0f032eb2717f57207edf74c745bcb86e360310b3"),
+    "16.11.1-windows_amd64": ("node-v16.11.1-win-x64.zip", "node-v16.11.1-win-x64", "4d3c179b82d42e66e321c3948a4e332ed78592917a69d38b86e3a242d7e62fb7"),
   },
-  node_version = "14.17.6",
+  node_version = "16.11.1",
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],

config/node.options

@@ -4,3 +4,6 @@
 
 ## max size of old space in megabytes
 #--max-old-space-size=4096
+
+## do not terminate process on unhandled promise rejection
+ --unhandled-rejections=warn

package.json

@@ -69,7 +69,7 @@
     "url": "https://github.com/elastic/kibana.git"
   },
   "resolutions": {
-    "**/@types/node": "14.14.44",
+    "**/@types/node": "16.10.2",
     "**/chokidar": "^3.4.3",
     "**/deepmerge": "^4.2.2",
     "**/fast-deep-equal": "^3.1.1",
@@ -87,7 +87,7 @@
     "**/underscore": "^1.13.1"
   },
   "engines": {
-    "node": "14.17.6",
+    "node": "16.11.1",
     "yarn": "^1.21.1"
   },
   "dependencies": {
@@ -565,12 +565,12 @@
     "@types/minimatch": "^2.0.29",
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^8.2.0",
-    "@types/mock-fs": "^4.10.0",
+    "@types/mock-fs": "^4.13.1",
     "@types/moment-timezone": "^0.5.12",
     "@types/mustache": "^0.8.31",
     "@types/ncp": "^2.0.1",
     "@types/nock": "^10.0.3",
-    "@types/node": "14.14.44",
+    "@types/node": "16.10.2",
     "@types/node-fetch": "^2.5.7",
     "@types/node-forge": "^0.10.5",
     "@types/nodemailer": "^6.4.0",
@@ -758,7 +758,7 @@
     "mocha-junit-reporter": "^2.0.0",
     "mochawesome": "^6.2.1",
     "mochawesome-merge": "^4.2.0",
-    "mock-fs": "^4.12.0",
+    "mock-fs": "^5.1.1",
     "mock-http-server": "1.3.0",
     "ms-chromium-edge-driver": "^0.4.2",
     "multimatch": "^4.0.0",

packages/kbn-dev-utils/src/proc_runner/proc.ts

@@ -131,15 +131,15 @@ export function startProc(name: string, options: ProcOptions, log: ToolingLog) {
     await withTimeout(
       async () => {
         log.debug(`Sending "${signal}" to proc "${name}"`);
-        await treeKillAsync(childProcess.pid, signal);
+        await treeKillAsync(childProcess.pid!, signal);
         await outcomePromise;
       },
       STOP_TIMEOUT,
       async () => {
         log.warning(
           `Proc "${name}" was sent "${signal}" didn't emit the "exit" or "error" events after ${STOP_TIMEOUT} ms, sending SIGKILL`
         );
-        await treeKillAsync(childProcess.pid, 'SIGKILL');
+        await treeKillAsync(childProcess.pid!, 'SIGKILL');
       }
     );
 

packages/kbn-i18n/BUILD.bazel

@@ -48,6 +48,7 @@ TYPES_DEPS = [
   "@npm//tslib",
   "@npm//@types/intl-relativeformat",
   "@npm//@types/jest",
+  "@npm//@types/node",
   "@npm//@types/prop-types",
   "@npm//@types/react",
   "@npm//@types/react-intl",

packages/kbn-test/src/jest/run.ts

@@ -28,6 +28,20 @@ import { map } from 'lodash';
 // yarn test:jest src/core/public/core_system.test.ts
 // :kibana/src/core/server/saved_objects yarn test:jest
 
+// Patch node 16 types to be compatible with jest 26
+// https://github.com/facebook/jest/issues/11640#issuecomment-893867514
+/* eslint-disable */
+declare global {
+  namespace NodeJS {
+    interface Global {}
+    interface InspectOptions {}
+
+    interface ConsoleConstructor
+      extends console.ConsoleConstructor {}
+  }
+}
+/* eslint-enable */
+
 export function runJest(configName = 'jest.config.js') {
   const argv = buildArgv(process.argv);
 

src/core/server/bootstrap.ts

@@ -51,7 +51,7 @@ export async function bootstrap({ configs, cliArgs, applyConfigOverrides }: Boot
   // This is only used by the LogRotator service
   // in order to be able to reload the log configuration
   // under the cluster mode
-  process.on('message', (msg) => {
+  process.on('message', (msg: any) => {
     if (!msg || msg.reloadConfiguration !== true) {
       return;
     }

src/core/server/environment/environment_service.test.ts

@@ -136,7 +136,8 @@ describe('UuidService', () => {
       });
     });
 
-    describe('unhandledRejection warnings', () => {
+    // TODO: From Nodejs v16 emitting an unhandledRejection will kill the process
+    describe.skip('unhandledRejection warnings', () => {
       it('logs warn for an unhandeld promise rejected with an Error', async () => {
         await service.preboot();
 

src/core/server/execution_context/integration_tests/tracing.test.ts

@@ -45,7 +45,7 @@ describe('trace', () => {
       },
     });
     await root.preboot();
-  }, 30000);
+  }, 60000);
 
   afterEach(async () => {
     await root.shutdown();

src/core/server/http/http_server.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { Server } from 'http';
-import { rmdir, mkdtemp, readFile, writeFile } from 'fs/promises';
+import { rm, mkdtemp, readFile, writeFile } from 'fs/promises';
 import supertest from 'supertest';
 import { omit } from 'lodash';
 import { join } from 'path';
@@ -1419,7 +1419,7 @@ describe('setup contract', () => {
 
     afterAll(async () => {
       if (tempDir) {
-        await rmdir(tempDir, { recursive: true });
+        await rm(tempDir, { recursive: true });
       }
     });
 

src/core/server/http/router/request.ts

@@ -221,10 +221,8 @@ export class KibanaRequest<
   }
 
   private getEvents(request: Request): KibanaRequestEvents {
-    const finish$ = merge(
-      fromEvent(request.raw.res, 'finish'), // Response has been sent
-      fromEvent(request.raw.req, 'close') // connection was closed
-    ).pipe(shareReplay(1), first());
+    // the response is completed, or its underlying connection was terminated prematurely
+    const finish$ = fromEvent(request.raw.res, 'close').pipe(shareReplay(1), first());
 
     const aborted$ = fromEvent<void>(request.raw.req, 'aborted').pipe(first(), takeUntil(finish$));
     const completed$ = merge<void, void>(finish$, aborted$).pipe(shareReplay(1), first());

src/core/server/http/router/validator/validator.test.ts

@@ -48,7 +48,7 @@ describe('Router validator', () => {
     expect(() => validator.getParams({})).toThrowError('[foo]: Not a string');
 
     expect(() => validator.getParams(undefined)).toThrowError(
-      `Cannot read property 'foo' of undefined`
+      `Cannot read properties of undefined (reading 'foo')`
     );
     expect(() => validator.getParams({}, 'myField')).toThrowError('[myField.foo]: Not a string');
 

src/core/server/logging/integration_tests/rolling_file_appender.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { join } from 'path';
-import { rmdir, mkdtemp, readFile, readdir } from 'fs/promises';
+import { rm, mkdtemp, readFile, readdir } from 'fs/promises';
 import moment from 'moment-timezone';
 import * as kbnTestServer from '../../../test_helpers/kbn_server';
 import { getNextRollingTime } from '../appenders/rolling_file/policies/time_interval/get_next_rolling_time';
@@ -48,7 +48,7 @@ describe('RollingFileAppender', () => {
 
   afterEach(async () => {
     if (testDir) {
-      await rmdir(testDir, { recursive: true });
+      await rm(testDir, { recursive: true });
     }
 
     if (root) {

src/core/server/metrics/event_loop_delays/event_loop_delays_monitor.ts

@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { EventLoopDelayMonitor } from 'perf_hooks';
+import type { IntervalHistogram as PerfIntervalHistogram } from 'perf_hooks';
 import { monitorEventLoopDelay } from 'perf_hooks';
 import type { IntervalHistogram } from '../types';
 
 export class EventLoopDelaysMonitor {
-  private readonly loopMonitor: EventLoopDelayMonitor;
+  private readonly loopMonitor: PerfIntervalHistogram;
   private fromTimestamp: Date;
 
   /**

src/core/server/metrics/integration_tests/server_collector.test.ts

@@ -15,6 +15,7 @@ import { HttpService, IRouter } from '../../http';
 import { contextServiceMock } from '../../context/context_service.mock';
 import { executionContextServiceMock } from '../../execution_context/execution_context_service.mock';
 import { ServerMetricsCollector } from '../collectors/server';
+import { setTimeout as setTimeoutPromise } from 'timers/promises';
 
 const requestWaitDelay = 25;
 
@@ -195,6 +196,9 @@ describe('ServerMetricsCollector', () => {
 
     waitSubject.next('go');
     await Promise.all([res1, res2]);
+    // Give the event-loop one more cycle to allow concurrent connections to be
+    // up to date before collecting
+    await setTimeoutPromise(0);
     metrics = await collector.collect();
     expect(metrics.concurrent_connections).toEqual(0);
   });

src/core/server/status/plugins_status.ts

@@ -128,7 +128,7 @@ export class PluginsStatusService {
 
         return combineLatest(pluginStatuses).pipe(
           map((statuses) => Object.fromEntries(statuses)),
-          distinctUntilChanged(isDeepStrictEqual)
+          distinctUntilChanged<Record<PluginName, ServiceStatus>>(isDeepStrictEqual)
         );
       })
     );

src/core/server/status/status_service.ts

@@ -84,7 +84,7 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
         });
         return summary;
       }),
-      distinctUntilChanged(isDeepStrictEqual),
+      distinctUntilChanged<ServiceStatus<unknown>>(isDeepStrictEqual),
       shareReplay(1)
     );
 
@@ -100,7 +100,7 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
         });
         return coreOverall;
       }),
-      distinctUntilChanged(isDeepStrictEqual),
+      distinctUntilChanged<ServiceStatus<unknown>>(isDeepStrictEqual),
       shareReplay(1)
     );
 
@@ -186,7 +186,7 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
         elasticsearch: elasticsearchStatus,
         savedObjects: savedObjectsStatus,
       })),
-      distinctUntilChanged(isDeepStrictEqual),
+      distinctUntilChanged<CoreStatus>(isDeepStrictEqual),
       shareReplay(1)
     );
   }

src/dev/build/tasks/patch_native_modules_task.ts

@@ -36,12 +36,12 @@ const packages: Package[] = [
     extractMethod: 'gunzip',
     archives: {
       'darwin-x64': {
-        url: 'https://github.com/uhop/node-re2/releases/download/1.16.0/darwin-x64-83.gz',
-        sha256: 'ef49febcba972b488727ce329ea9d2b57590bb44001ed494f2aa1397c0ebc32b',
+        url: 'https://github.com/uhop/node-re2/releases/download/1.16.0/darwin-x64-93.gz',
+        sha256: 'a267c6202d86d08170eb4a833acf81d83660ce33e8981fcd5b7f6e0310961d56',
       },
       'linux-x64': {
-        url: 'https://github.com/uhop/node-re2/releases/download/1.16.0/linux-x64-83.gz',
-        sha256: '160217dd83eb7093b758e905ce09cb45182864c7df858bf2525a68924a23c509',
+        url: 'https://github.com/uhop/node-re2/releases/download/1.16.0/linux-x64-93.gz',
+        sha256: 'e0ca5d6527fe7ec0fe98b6960c47b66a5bb2823c3bebb3bf4ed4d58eed3d23c5',
       },
 
       // ARM build is currently done manually as Github Actions used in upstream project
@@ -55,12 +55,12 @@ const packages: Package[] = [
       // * gzip -c build/Release/re2.node > linux-arm64-83.gz
       // * upload to kibana-ci-proxy-cache bucket
       'linux-arm64': {
-        url: 'https://storage.googleapis.com/kibana-ci-proxy-cache/node-re2/uhop/node-re2/releases/download/1.16.0/linux-arm64-83.gz',
-        sha256: '114505c60dbf57ad30556937ac5f49213c6676ad79d92706b96949d3a63f53b4',
+        url: 'https://storage.googleapis.com/kibana-ci-proxy-cache/node-re2/uhop/node-re2/releases/download/1.16.0/linux-arm64-93.gz',
+        sha256: '7a786e0b75985e5aafdefa9af55cad8e85e69a3326f16d8c63d21d6b5b3bff1b',
       },
       'win32-x64': {
-        url: 'https://github.com/uhop/node-re2/releases/download/1.16.0/win32-x64-83.gz',
-        sha256: '92ad420a6bfcedeb58dadf807a2f2901b05251d1edd3950051699929eda23073',
+        url: 'https://github.com/uhop/node-re2/releases/download/1.16.0/win32-x64-93.gz',
+        sha256: '37245ceb59a086b5e7e9de8746a3cdf148c383be9ae2580f92baea90d0d39947',
       },
     },
   },

src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx

@@ -95,7 +95,8 @@ afterAll(() => {
   sizeMe.noPlaceholders = false;
 });
 
-test('renders DashboardGrid', () => {
+// unhandled promise rejection: https://github.com/elastic/kibana/issues/112699
+test.skip('renders DashboardGrid', () => {
   const { props, options } = prepare();
   const component = mountWithIntl(
     <KibanaContextProvider services={options}>
@@ -108,7 +109,8 @@ test('renders DashboardGrid', () => {
   expect(panelElements.length).toBe(2);
 });
 
-test('renders DashboardGrid with no visualizations', () => {
+// unhandled promise rejection: https://github.com/elastic/kibana/issues/112699
+test.skip('renders DashboardGrid with no visualizations', () => {
   const { props, options } = prepare();
   const component = mountWithIntl(
     <KibanaContextProvider services={options}>
@@ -123,7 +125,8 @@ test('renders DashboardGrid with no visualizations', () => {
   expect(component.find('EmbeddableChildPanel').length).toBe(0);
 });
 
-test('DashboardGrid removes panel when removed from container', () => {
+// unhandled promise rejection: https://github.com/elastic/kibana/issues/112699
+test.skip('DashboardGrid removes panel when removed from container', () => {
   const { props, options } = prepare();
   const component = mountWithIntl(
     <KibanaContextProvider services={options}>
@@ -142,7 +145,8 @@ test('DashboardGrid removes panel when removed from container', () => {
   expect(panelElements.length).toBe(1);
 });
 
-test('DashboardGrid renders expanded panel', () => {
+// unhandled promise rejection: https://github.com/elastic/kibana/issues/112699
+test.skip('DashboardGrid renders expanded panel', () => {
   const { props, options } = prepare();
   const component = mountWithIntl(
     <KibanaContextProvider services={options}>
@@ -170,7 +174,8 @@ test('DashboardGrid renders expanded panel', () => {
   ).toBeUndefined();
 });
 
-test('DashboardGrid unmount unsubscribes', async (done) => {
+// unhandled promise rejection: https://github.com/elastic/kibana/issues/112699
+test.skip('DashboardGrid unmount unsubscribes', async (done) => {
   const { props, options } = prepare();
   const component = mountWithIntl(
     <KibanaContextProvider services={options}>