Fixing merge conflicts

.ci/Jenkinsfile_baseline_capture

@@ -12,12 +12,12 @@ kibanaPipeline(timeoutMinutes: 120) {
  ]) {
  parallel([
  'oss-baseline': {
- workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
+ workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
  kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
  }
  },
  'xpack-baseline': {
- workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
+ workers.ci(name: 'xpack-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
  kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
  }
  },

docs/apm/service-maps.asciidoc

@@ -2,11 +2,6 @@
 [[service-maps]]
 === Service maps
 
-beta::[]
-
-WARNING: Service map support for Internet Explorer 11 is extremely limited.
-Please use Chrome or Firefox if available.
-
 A service map is a real-time visual representation of the instrumented services in your application's architecture.
 It shows you how these services are connected, along with high-level metrics like average transaction duration,
 requests per minute, and errors per minute.

docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md

@@ -29,4 +29,5 @@ export interface SavedObjectsFindOptions
 | [sortField](./kibana-plugin-core-public.savedobjectsfindoptions.sortfield.md) | <code>string</code> | |
 | [sortOrder](./kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md) | <code>string</code> | |
 | [type](./kibana-plugin-core-public.savedobjectsfindoptions.type.md) | <code>string &#124; string[]</code> | |
+| [typeToNamespacesMap](./kibana-plugin-core-public.savedobjectsfindoptions.typetonamespacesmap.md) | <code>Map&lt;string, string[] &#124; undefined&gt;</code> | This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the <code>type</code> and <code>namespaces</code> fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
 

docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.typetonamespacesmap.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsFindOptions](./kibana-plugin-core-public.savedobjectsfindoptions.md) &gt; [typeToNamespacesMap](./kibana-plugin-core-public.savedobjectsfindoptions.typetonamespacesmap.md)
+
+## SavedObjectsFindOptions.typeToNamespacesMap property
+
+This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the `type` and `namespaces` fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace.
+
+<b>Signature:</b>
+
+```typescript
+typeToNamespacesMap?: Map<string, string[] | undefined>;
+```

docs/development/core/server/kibana-plugin-core-server.kibanarequest.md

@@ -33,4 +33,5 @@ export declare class KibanaRequest<Params = unknown, Query = unknown, Body = unk
 | [route](./kibana-plugin-core-server.kibanarequest.route.md) | | <code>RecursiveReadonly&lt;KibanaRequestRoute&lt;Method&gt;&gt;</code> | matched route details |
 | [socket](./kibana-plugin-core-server.kibanarequest.socket.md) | | <code>IKibanaSocket</code> | [IKibanaSocket](./kibana-plugin-core-server.ikibanasocket.md) |
 | [url](./kibana-plugin-core-server.kibanarequest.url.md) | | <code>Url</code> | a WHATWG URL standard object. |
+| [uuid](./kibana-plugin-core-server.kibanarequest.uuid.md) | | <code>string</code> | A UUID to identify this request. |
 

docs/development/core/server/kibana-plugin-core-server.kibanarequest.uuid.md

@@ -0,0 +1,18 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md) &gt; [uuid](./kibana-plugin-core-server.kibanarequest.uuid.md)
+
+## KibanaRequest.uuid property
+
+A UUID to identify this request.
+
+<b>Signature:</b>
+
+```typescript
+readonly uuid: string;
+```
+
+## Remarks
+
+This value is NOT sourced from the incoming request's `X-Opaque-Id` header. it is always a UUID uniquely identifying the request.
+

docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md

@@ -29,4 +29,5 @@ export interface SavedObjectsFindOptions
 | [sortField](./kibana-plugin-core-server.savedobjectsfindoptions.sortfield.md) | <code>string</code> | |
 | [sortOrder](./kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md) | <code>string</code> | |
 | [type](./kibana-plugin-core-server.savedobjectsfindoptions.type.md) | <code>string &#124; string[]</code> | |
+| [typeToNamespacesMap](./kibana-plugin-core-server.savedobjectsfindoptions.typetonamespacesmap.md) | <code>Map&lt;string, string[] &#124; undefined&gt;</code> | This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the <code>type</code> and <code>namespaces</code> fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
 

docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.typetonamespacesmap.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsFindOptions](./kibana-plugin-core-server.savedobjectsfindoptions.md) &gt; [typeToNamespacesMap](./kibana-plugin-core-server.savedobjectsfindoptions.typetonamespacesmap.md)
+
+## SavedObjectsFindOptions.typeToNamespacesMap property
+
+This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the `type` and `namespaces` fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace.
+
+<b>Signature:</b>
+
+```typescript
+typeToNamespacesMap?: Map<string, string[] | undefined>;
+```

docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.find.md

@@ -7,14 +7,14 @@
 <b>Signature:</b>
 
 ```typescript
-find<T = unknown>({ search, defaultSearchOperator, searchFields, rootSearchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
+find<T = unknown>(options: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
 ```
 
 ## Parameters
 
 | Parameter | Type | Description |
 | --- | --- | --- |
-| { search, defaultSearchOperator, searchFields, rootSearchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, } | <code>SavedObjectsFindOptions</code> | |
+| options | <code>SavedObjectsFindOptions</code> | |
 
 <b>Returns:</b>
 

docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md

@@ -24,7 +24,7 @@ export declare class SavedObjectsRepository
 | [delete(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.delete.md) | | Deletes an object |
 | [deleteByNamespace(namespace, options)](./kibana-plugin-core-server.savedobjectsrepository.deletebynamespace.md) | | Deletes all objects from the provided namespace. |
 | [deleteFromNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md) | | Removes one or more namespaces from a given multi-namespace saved object. If no namespaces remain, the saved object is deleted entirely. This method and \[<code>addToNamespaces</code>\][SavedObjectsRepository.addToNamespaces()](./kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md) are the only ways to change which Spaces a multi-namespace saved object is shared to. |
-| [find({ search, defaultSearchOperator, searchFields, rootSearchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, })](./kibana-plugin-core-server.savedobjectsrepository.find.md) | | |
+| [find(options)](./kibana-plugin-core-server.savedobjectsrepository.find.md) | | |
 | [get(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.get.md) | | Gets a single object |
 | [incrementCounter(type, id, counterFieldName, options)](./kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md) | | Increases a counter field by one. Creates the document if one doesn't exist for the given id. |
 | [update(type, id, attributes, options)](./kibana-plugin-core-server.savedobjectsrepository.update.md) | | Updates an object |

docs/development/core/server/kibana-plugin-core-server.savedobjectsutils.createemptyfindresponse.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsUtils](./kibana-plugin-core-server.savedobjectsutils.md) &gt; [createEmptyFindResponse](./kibana-plugin-core-server.savedobjectsutils.createemptyfindresponse.md)
+
+## SavedObjectsUtils.createEmptyFindResponse property
+
+Creates an empty response for a find operation. This is only intended to be used by saved objects client wrappers.
+
+<b>Signature:</b>
+
+```typescript
+static createEmptyFindResponse: <T>({ page, perPage, }: SavedObjectsFindOptions) => SavedObjectsFindResponse<T>;
+```

docs/development/core/server/kibana-plugin-core-server.savedobjectsutils.md

@@ -15,6 +15,7 @@ export declare class SavedObjectsUtils
 
 | Property | Modifiers | Type | Description |
 | --- | --- | --- | --- |
+| [createEmptyFindResponse](./kibana-plugin-core-server.savedobjectsutils.createemptyfindresponse.md) | <code>static</code> | <code>&lt;T&gt;({ page, perPage, }: SavedObjectsFindOptions) =&gt; SavedObjectsFindResponse&lt;T&gt;</code> | Creates an empty response for a find operation. This is only intended to be used by saved objects client wrappers. |
 | [namespaceIdToString](./kibana-plugin-core-server.savedobjectsutils.namespaceidtostring.md) | <code>static</code> | <code>(namespace?: string &#124; undefined) =&gt; string</code> | Converts a given saved object namespace ID to its string representation. All namespace IDs have an identical string representation, with the exception of the <code>undefined</code> namespace ID (which has a namespace string of <code>'default'</code>). |
 | [namespaceStringToId](./kibana-plugin-core-server.savedobjectsutils.namespacestringtoid.md) | <code>static</code> | <code>(namespace: string) =&gt; string &#124; undefined</code> | Converts a given saved object namespace string to its ID representation. All namespace strings have an identical ID representation, with the exception of the <code>'default'</code> namespace string (which has a namespace ID of <code>undefined</code>). |
 

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.getfieldsforwildcard.md

@@ -12,14 +12,17 @@ Get a list of field objects for an index pattern that may contain wildcards
 getFieldsForWildcard(options: {
  pattern: string | string[];
  metaFields?: string[];
+ fieldCapsOptions?: {
+ allowNoIndices: boolean;
+ };
  }): Promise<FieldDescriptor[]>;
 ```
 
 ## Parameters
 
 | Parameter | Type | Description |
 | --- | --- | --- |
-| options | <code>{</code><br/><code> pattern: string &#124; string[];</code><br/><code> metaFields?: string[];</code><br/><code> }</code> | |
+| options | <code>{</code><br/><code> pattern: string &#124; string[];</code><br/><code> metaFields?: string[];</code><br/><code>  fieldCapsOptions?: {</code><br/><code> allowNoIndices: boolean;</code><br/><code> };</code><br/><code> }</code> | |
 
 <b>Returns:</b>
 

docs/user/monitoring/viewing-metrics.asciidoc

@@ -13,13 +13,19 @@ At a minimum, you must have monitoring data for the {es} production cluster.
 Once that data exists, {kib} can display monitoring data for other products in
 the cluster.
 
+TIP: If you use a separate monitoring cluster to store the monitoring data, it
+is strongly recommended that you use a separate {kib} instance to view it. If
+you log in to {kib} using SAML, Kerberos, PKI, OpenID Connect, or token
+authentication providers, a dedicated {kib} instance is *required*. The security
+tokens that are used in these contexts are cluster-specific, therefore you
+cannot use a single {kib} instance to connect to both production and monitoring
+clusters. For more information about the recommended configuration, see
+{ref}/monitoring-overview.html[Monitoring overview].
+
 . Identify where to retrieve monitoring data from.
 +
 --
-The cluster that contains the monitoring data is referred to
-as the _monitoring cluster_.
-
-TIP: If the monitoring data is stored on a *dedicated* monitoring cluster, it is
+If the monitoring data is stored on a dedicated monitoring cluster, it is
 accessible even when the cluster you're monitoring is not. If you have at least
 a gold license, you can send data from multiple clusters to the same monitoring
 cluster and view them all through the same instance of {kib}.

package.json

@@ -350,7 +350,7 @@
  "babel-eslint": "^10.0.3",
  "babel-jest": "^25.5.1",
  "babel-plugin-istanbul": "^6.0.0",
- "backport": "5.5.1",
+ "backport": "5.6.0",
  "brace": "0.11.1",
  "chai": "3.5.0",
  "chance": "1.0.18",

packages/kbn-es-archiver/src/cli.ts

@@ -144,7 +144,7 @@ export function runCli() {
 
  const query = flags.query;
  let parsedQuery;
- if (typeof query === 'string') {
+ if (typeof query === 'string' && query.length > 0) {
  try {
  parsedQuery = JSON.parse(query);
  } catch (err) {

src/core/public/public.api.md

@@ -1079,6 +1079,7 @@ export interface SavedObjectsFindOptions {
  sortOrder?: string;
  // (undocumented)
  type: string | string[];
+ typeToNamespacesMap?: Map<string, string[] | undefined>;
 }
 
 // @public

src/core/public/saved_objects/saved_objects_client.ts

@@ -34,7 +34,7 @@ import { HttpFetchOptions, HttpSetup } from '../http';
 
 type SavedObjectsFindOptions = Omit<
  SavedObjectFindOptionsServer,
- 'namespace' | 'sortOrder' | 'rootSearchFields'
+ 'sortOrder' | 'rootSearchFields' | 'typeToNamespacesMap'
 >;
 
 type PromiseType<T extends Promise<any>> = T extends Promise<infer U> ? U : never;

src/core/server/elasticsearch/client/cluster_client.test.ts

@@ -206,7 +206,7 @@ describe('ClusterClient', () => {
 
  const clusterClient = new ClusterClient(config, logger, getAuthHeaders);
  const request = httpServerMock.createKibanaRequest({
- kibanaRequestState: { requestId: 'my-fake-id' },
+ kibanaRequestState: { requestId: 'my-fake-id', requestUuid: 'ignore-this-id' },
  });
 
  clusterClient.asScoped(request);
@@ -284,7 +284,7 @@ describe('ClusterClient', () => {
  const clusterClient = new ClusterClient(config, logger, getAuthHeaders);
  const request = httpServerMock.createKibanaRequest({
  headers: { foo: 'request' },
- kibanaRequestState: { requestId: 'from request' },
+ kibanaRequestState: { requestId: 'from request', requestUuid: 'ignore-this-id' },
  });
 
  clusterClient.asScoped(request);

src/core/server/elasticsearch/legacy/cluster_client.test.ts

@@ -351,7 +351,9 @@ describe('#asScoped', () => {
 
  test('passes x-opaque-id header with request id', () => {
  clusterClient.asScoped(
- httpServerMock.createKibanaRequest({ kibanaRequestState: { requestId: 'alpha' } })
+ httpServerMock.createKibanaRequest({
+ kibanaRequestState: { requestId: 'alpha', requestUuid: 'ignore-this-id' },
+ })
  );
 
  expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);

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

@@ -68,7 +68,7 @@ function createKibanaRequestMock<P = any, Q = any, B = any>({
  routeAuthRequired,
  validation = {},
  kibanaRouteOptions = { xsrfRequired: true },
- kibanaRequestState = { requestId: '123' },
+ kibanaRequestState = { requestId: '123', requestUuid: '123e4567-e89b-12d3-a456-426614174000' },
  auth = { isAuthenticated: true },
 }: RequestFixtureOptions<P, Q, B> = {}) {
  const queryString = stringify(query, { sort: false });

src/core/server/http/http_server.ts

@@ -19,6 +19,7 @@
 import { Server } from 'hapi';
 import HapiStaticFiles from 'inert';
 import url from 'url';
+import uuid from 'uuid';
 
 import { Logger, LoggerFactory } from '../logging';
 import { HttpConfig } from './http_config';
@@ -315,6 +316,7 @@ export class HttpServer {
  request.app = {
  ...(request.app ?? {}),
  requestId: getRequestId(request, config.requestId),
+ requestUuid: uuid.v4(),
  } as KibanaRequestState;
  return responseToolkit.continue;
  });

src/core/server/http/integration_tests/request.test.ts

@@ -16,6 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+jest.mock('uuid', () => ({
+ v4: jest.fn().mockReturnValue('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'),
+}));
+
 import supertest from 'supertest';
 
 import { HttpService } from '../http_service';
@@ -308,4 +313,20 @@ describe('KibanaRequest', () => {
  expect(resp3.body).toEqual({ requestId: 'gamma' });
  });
  });
+
+ describe('request uuid', () => {
+ it('generates a UUID', async () => {
+ const { server: innerServer, createRouter } = await server.setup(setupDeps);
+ const router = createRouter('/');
+ router.get({ path: '/', validate: false }, async (context, req, res) => {
+ return res.ok({ body: { requestUuid: req.uuid } });
+ });
+ await server.start();
+
+ const st = supertest(innerServer.listener);
+
+ const resp1 = await st.get('/').expect(200);
+ expect(resp1.body.requestUuid).toBe('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx');
+ });
+ });
 });

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

@@ -55,6 +55,34 @@ describe('KibanaRequest', () => {
  });
  });
 
+ describe('uuid property', () => {
+ it('uses the request.app.requestUuid property if present', () => {
+ const request = httpServerMock.createRawRequest({
+ app: { requestUuid: '123e4567-e89b-12d3-a456-426614174000' },
+ });
+ const kibanaRequest = KibanaRequest.from(request);
+ expect(kibanaRequest.uuid).toEqual('123e4567-e89b-12d3-a456-426614174000');
+ });
+
+ it('generates a new UUID if request.app property is not present', () => {
+ // Undefined app property
+ const request = httpServerMock.createRawRequest({
+ app: undefined,
+ });
+ const kibanaRequest = KibanaRequest.from(request);
+ expect(kibanaRequest.uuid).toEqual('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx');
+ });
+
+ it('generates a new UUID if request.app.requestUuid property is not present', () => {
+ // Undefined app.requestUuid property
+ const request = httpServerMock.createRawRequest({
+ app: {},
+ });
+ const kibanaRequest = KibanaRequest.from(request);
+ expect(kibanaRequest.uuid).toEqual('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx');
+ });
+ });
+
  describe('get all headers', () => {
  it('returns all headers', () => {
  const request = httpServerMock.createRawRequest({