Merge branch 'master' into search-session-user

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -21,6 +21,7 @@ readonly links: {
  readonly installation: string;
  readonly configuration: string;
  readonly elasticsearchOutput: string;
+ readonly elasticsearchModule: string;
  readonly startup: string;
  readonly exportedFields: string;
  };
@@ -29,6 +30,10 @@ readonly links: {
  };
  readonly metricbeat: {
  readonly base: string;
+ readonly configure: string;
+ readonly httpEndpoint: string;
+ readonly install: string;
+ readonly start: string;
  };
  readonly enterpriseSearch: {
  readonly base: string;

docs/maps/connect-to-ems.asciidoc

@@ -86,7 +86,7 @@ endif::[]
 
 [cols="2*<"]
 |===
-| [[ems-hostname]]`hostname`
+| [[ems-host]]`host`
  | Specifies the host of the backend server. To allow remote users to connect, set the value to the IP address or DNS name of the {hosted-ems} container. *Default: _your-hostname_*. <<server-host,Equivalent {kib} setting>>.
 
 | `port`
@@ -199,7 +199,7 @@ TIP: The available basemaps and boundaries can be explored from the `/maps` endp
 [[elastic-maps-server-kibana]]
 ==== Kibana configuration
 
-With {hosted-ems} running, add the `map.emsUrl` configuration key in your <<settings, kibana.yml>> file pointing to the root of the service. This setting will point {kib} to request EMS basemaps and boundaries from {hosted-ems}. Typically this will be the URL to the <<ems-hostname,hostname and port>> of {hosted-ems}. For example, `map.emsUrl: https://my-ems-server:8080`. 
+With {hosted-ems} running, add the `map.emsUrl` configuration key in your <<settings, kibana.yml>> file pointing to the root of the service. This setting will point {kib} to request EMS basemaps and boundaries from {hosted-ems}. Typically this will be the URL to the <<ems-host,host and port>> of {hosted-ems}. For example, `map.emsUrl: https://my-ems-server:8080`. 
 
 
 [float]

docs/maps/maps-aggregations.asciidoc

@@ -68,9 +68,9 @@ To enable a blended layer that dynamically shows clusters or documents:
 
 [role="xpack"]
 [[maps-top-hits-aggregation]]
-=== Top hits per entity
+=== Display the most relevant documents per entity
 
-You can display the most relevant documents per entity, for example, the most recent GPS tracks per flight.
+Use *Top hits per entity* to display the most relevant documents per entity, for example, the most recent GPS tracks per flight route.
 To get this data, {es} first groups your data using a {ref}/search-aggregations-bucket-terms-aggregation.html[terms aggregation],
 then accumulates the most relevant documents based on sort order for each entry using a {ref}/search-aggregations-metrics-top-hits-aggregation.html[top hits metric aggregation].
 

docs/setup/install/deb.asciidoc

@@ -8,12 +8,8 @@ The Debian package for Kibana can be <<install-deb,downloaded from our website>>
 or from our <<deb-repo,APT repository>>. It can be used to install
 Kibana on any Debian-based system such as Debian and Ubuntu.
 
-This package is free to use under the Elastic license. It contains open source
-and free commercial features and access to paid commercial features.
-<<managing-licenses,Start a 30-day trial>> to try out all of the
-paid commercial features. See the
-https://www.elastic.co/subscriptions[Subscriptions] page for information about
-Elastic license levels.
+This package contains both free and subscription features.
+<<managing-licenses,Start a 30-day trial>> to try out all of the features.
 
 The latest stable version of Kibana can be found on the
 link:/downloads/kibana[Download Kibana] page. Other versions can

docs/setup/install/rpm.asciidoc

@@ -13,12 +13,8 @@ and Oracle Enterprise.
 NOTE: RPM install is not supported on distributions with old versions of RPM,
 such as SLES 11 and CentOS 5. Please see <<targz>> instead.
 
-This package is free to use under the Elastic license. It contains open source
-and free commercial features and access to paid commercial features.
-<<managing-licenses,Start a 30-day trial>> to try out all of the
-paid commercial features. See the
-https://www.elastic.co/subscriptions[Subscriptions] page for information about
-Elastic license levels.
+This package contains both free and subscription features.
+<<managing-licenses,Start a 30-day trial>> to try out all of the features.
 
 The latest stable version of Kibana can be found on the
 link:/downloads/kibana[Download Kibana] page. Other versions can

docs/setup/install/targz.asciidoc

@@ -7,12 +7,8 @@
 Kibana is provided for Linux and Darwin as a `.tar.gz` package. These packages
 are the easiest formats to use when trying out Kibana.
 
-These packages are free to use under the Elastic license. They contain open
-source and free commercial features and access to paid commercial features.
-<<managing-licenses,Start a 30-day trial>> to try out all of the
-paid commercial features. See the
-https://www.elastic.co/subscriptions[Subscriptions] page for information about
-Elastic license levels.
+This package contains both free and subscription features.
+<<managing-licenses,Start a 30-day trial>> to try out all of the features.
 
 The latest stable version of Kibana can be found on the
 link:/downloads/kibana[Download Kibana] page.

docs/setup/install/windows.asciidoc

@@ -6,12 +6,8 @@
 
 Kibana can be installed on Windows using the `.zip` package.
 
-This package is free to use under the Elastic license. It contains open source
-and free commercial features and access to paid commercial features.
-<<managing-licenses,Start a 30-day trial>> to try out all of the
-paid commercial features. See the
-https://www.elastic.co/subscriptions[Subscriptions] page for information about
-Elastic license levels.
+This package contains both free and subscription features.
+<<managing-licenses,Start a 30-day trial>> to try out all of the features.
 
 The latest stable version of Kibana can be found on the
 link:/downloads/kibana[Download Kibana] page.

packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts

@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { createGunzip } from 'zlib';
 import mockFs from 'mock-fs';
 import { createReadStream } from 'fs';
 
@@ -54,6 +55,11 @@ describe('getPayloadSize', () => {
  const result = getResponsePayloadBytes(readStream);
  expect(result).toBe(Buffer.byteLength(data));
  });
+
+ test('ignores streams that are not instances of ReadStream', async () => {
+ const result = getResponsePayloadBytes(createGunzip());
+ expect(result).toBe(undefined);
+ });
  });
 
  describe('handles plain responses', () => {
@@ -72,6 +78,11 @@ describe('getPayloadSize', () => {
  const result = getResponsePayloadBytes(payload);
  expect(result).toBe(JSON.stringify(payload).length);
  });
+
+ test('returns undefined when source is not plain object', () => {
+ const result = getResponsePayloadBytes([1, 2, 3]);
+ expect(result).toBe(undefined);
+ });
  });
 
  describe('handles content-length header', () => {

packages/kbn-legacy-logging/src/utils/get_payload_size.ts

@@ -6,14 +6,13 @@
  * Side Public License, v 1.
  */
 
-import type { ReadStream } from 'fs';
+import { isPlainObject } from 'lodash';
+import { ReadStream } from 'fs';
 import type { ResponseObject } from '@hapi/hapi';
 
 const isBuffer = (obj: unknown): obj is Buffer => Buffer.isBuffer(obj);
-const isObject = (obj: unknown): obj is Record<string, unknown> =>
- typeof obj === 'object' && obj !== null;
 const isFsReadStream = (obj: unknown): obj is ReadStream =>
- typeof obj === 'object' && obj !== null && 'bytesRead' in obj;
+ typeof obj === 'object' && obj !== null && 'bytesRead' in obj && obj instanceof ReadStream;
 const isString = (obj: unknown): obj is string => typeof obj === 'string';
 
 /**
@@ -56,7 +55,7 @@ export function getResponsePayloadBytes(
  return Buffer.byteLength(payload);
  }
 
- if (isObject(payload)) {
+ if (isPlainObject(payload)) {
  return Buffer.byteLength(JSON.stringify(payload));
  }