Merge branch 'master' into reporting/unskip-screenshot-tests

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getidswithtitle.md

@@ -0,0 +1,16 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [getIdsWithTitle](./kibana-plugin-plugins-data-public.indexpatternsservice.getidswithtitle.md)
+
+## IndexPatternsService.getIdsWithTitle property
+
+Get list of index pattern ids with titles
+
+<b>Signature:</b>
+
+```typescript
+getIdsWithTitle: (refresh?: boolean) => Promise<Array<{
+        id: string;
+        title: string;
+    }>>;
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md

@@ -29,6 +29,7 @@ export declare class IndexPatternsService
 |  [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md) |  | <code>(indexPattern: IndexPattern &#124; IndexPatternSpec, options?: GetFieldsOptions) =&gt; Promise&lt;any&gt;</code> | Get field list by providing an index patttern (or spec) |
 |  [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md) |  | <code>(options?: GetFieldsOptions) =&gt; Promise&lt;any&gt;</code> | Get field list by providing { pattern } |
 |  [getIds](./kibana-plugin-plugins-data-public.indexpatternsservice.getids.md) |  | <code>(refresh?: boolean) =&gt; Promise&lt;string[]&gt;</code> | Get list of index pattern ids |
+|  [getIdsWithTitle](./kibana-plugin-plugins-data-public.indexpatternsservice.getidswithtitle.md) |  | <code>(refresh?: boolean) =&gt; Promise&lt;Array&lt;{</code><br/><code>        id: string;</code><br/><code>        title: string;</code><br/><code>    }&gt;&gt;</code> | Get list of index pattern ids with titles |
 |  [getTitles](./kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md) |  | <code>(refresh?: boolean) =&gt; Promise&lt;string[]&gt;</code> | Get list of index pattern titles |
 |  [refreshFields](./kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md) |  | <code>(indexPattern: IndexPattern) =&gt; Promise&lt;void&gt;</code> | Refresh field list for a given index pattern |
 |  [savedObjectToSpec](./kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md) |  | <code>(savedObject: SavedObject&lt;IndexPatternAttributes&gt;) =&gt; IndexPatternSpec</code> | Converts index pattern saved object to index pattern spec |

docs/redirects.asciidoc

@@ -100,3 +100,15 @@ This content has moved to the <<development-rbac, Security>> page.
 == TSVB
 
 This page was deleted. See <<tsvb>>.
+
+[role="exclude",id="managing-cross-cluster-replication"]
+== Cross-Cluster Replication
+
+This content has moved. See
+{ref}/ccr-getting-started.html[Set up cross-cluster replication].
+
+[role="exclude",id="working-remote-clusters"]
+== Remote clusters
+
+This content has moved. See
+{ref}/ccr-getting-started.html#ccr-getting-started-remote-cluster[Connect to a remote cluster].

docs/user/management.asciidoc

@@ -58,12 +58,12 @@ years of historical data in combination with your raw data.
 | {ref}/transforms.html[Transforms]
 |Use transforms to pivot existing {es} indices into summarized or entity-centric indices.
 
-| <<managing-cross-cluster-replication, Cross-Cluster Replication>>
+| {ref}/ccr-getting-started.html[Cross-Cluster Replication]
 |Replicate indices on a remote cluster and copy them to a follower index on a local cluster.
 This is important for
 disaster recovery. It also keeps data local for faster queries.
 
-| <<working-remote-clusters, Remote Clusters>>
+| {ref}/ccr-getting-started.html#ccr-getting-started-remote-cluster[Remote Clusters]
 |Manage your remote clusters for use with cross-cluster search and cross-cluster replication.
 You can add and remove remote clusters, and check their connectivity.
 |===
@@ -180,8 +180,6 @@ include::{kib-repo-dir}/management/alerting/connector-management.asciidoc[]
 
 include::{kib-repo-dir}/management/managing-beats.asciidoc[]
 
-include::{kib-repo-dir}/management/managing-ccr.asciidoc[]
-
 include::{kib-repo-dir}/management/index-lifecycle-policies/intro-to-lifecycle-policies.asciidoc[]
 
 include::{kib-repo-dir}/management/index-lifecycle-policies/create-policy.asciidoc[]
@@ -200,8 +198,6 @@ include::{kib-repo-dir}/management/managing-licenses.asciidoc[]
 
 include::{kib-repo-dir}/management/numeral.asciidoc[]
 
-include::{kib-repo-dir}/management/managing-remote-clusters.asciidoc[]
-
 include::{kib-repo-dir}/management/rollups/create_and_manage_rollups.asciidoc[]
 
 include::{kib-repo-dir}/management/managing-saved-objects.asciidoc[]

src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts

@@ -133,6 +133,25 @@ export class IndexPatternsService {
     return this.savedObjectsCache.map((obj) => obj?.attributes?.title);
   };
 
+  /**
+   * Get list of index pattern ids with titles
+   * @param refresh Force refresh of index pattern list
+   */
+  getIdsWithTitle = async (
+    refresh: boolean = false
+  ): Promise<Array<{ id: string; title: string }>> => {
+    if (!this.savedObjectsCache || refresh) {
+      await this.refreshSavedObjectsCache();
+    }
+    if (!this.savedObjectsCache) {
+      return [];
+    }
+    return this.savedObjectsCache.map((obj) => ({
+      id: obj?.id,
+      title: obj?.attributes?.title,
+    }));
+  };
+
   /**
    * Clear index pattern list cache
    * @param id optionally clear a single id

src/plugins/data/public/public.api.md

@@ -1381,6 +1381,10 @@ export class IndexPatternsService {
     // Warning: (ae-forgotten-export) The symbol "GetFieldsOptions" needs to be exported by the entry point index.d.ts
     getFieldsForWildcard: (options?: GetFieldsOptions) => Promise<any>;
     getIds: (refresh?: boolean) => Promise<string[]>;
+    getIdsWithTitle: (refresh?: boolean) => Promise<Array<{
+        id: string;
+        title: string;
+    }>>;
     getTitles: (refresh?: boolean) => Promise<string[]>;
     refreshFields: (indexPattern: IndexPattern) => Promise<void>;
     savedObjectToSpec: (savedObject: SavedObject<IndexPatternAttributes>) => IndexPatternSpec;

test/functional/apps/discover/_inspector.js

@@ -34,7 +34,8 @@ export default function ({ getService, getPageObjects }) {
     return hitsCountStatsRow[STATS_ROW_VALUE_INDEX];
   }
 
-  describe('inspect', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/39842
+  describe.skip('inspect', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('logstash_functional');
       await esArchiver.load('discover');

x-pack/plugins/enterprise_search/public/applications/__mocks__/index.ts

@@ -6,7 +6,7 @@
 
 export { mockHistory, mockLocation } from './react_router_history.mock';
 export { mockKibanaContext } from './kibana_context.mock';
-export { mockLicenseContext } from './license_context.mock';
+export { mockLicensingValues } from './licensing_logic.mock';
 export { mockHttpValues } from './http_logic.mock';
 export { mockFlashMessagesValues, mockFlashMessagesActions } from './flash_messages_logic.mock';
 export { mockAllValues, mockAllActions, setMockValues } from './kea.mock';

x-pack/plugins/enterprise_search/public/applications/__mocks__/kea.mock.ts

@@ -5,13 +5,17 @@
  */
 
 /**
+ * Combine all shared mock values/actions into a single obj
+ *
  * NOTE: These variable names MUST start with 'mock*' in order for
  * Jest to accept its use within a jest.mock()
  */
+import { mockLicensingValues } from './licensing_logic.mock';
 import { mockHttpValues } from './http_logic.mock';
 import { mockFlashMessagesValues, mockFlashMessagesActions } from './flash_messages_logic.mock';
 
 export const mockAllValues = {
+  ...mockLicensingValues,
   ...mockHttpValues,
   ...mockFlashMessagesValues,
 };

x-pack/plugins/enterprise_search/public/applications/__mocks__/license_context.mock.ts → x-pack/plugins/enterprise_search/public/applications/__mocks__/licensing_logic.mock.ts

@@ -6,6 +6,8 @@
 
 import { licensingMock } from '../../../../licensing/public/mocks';
 
-export const mockLicenseContext = {
+export const mockLicensingValues = {
   license: licensingMock.createLicense(),
+  hasPlatinumLicense: false,
+  hasGoldLicense: false,
 };

x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_with_context.mock.tsx

@@ -15,8 +15,6 @@ import { getContext, resetContext } from 'kea';
 import { I18nProvider } from '@kbn/i18n/react';
 import { KibanaContext } from '../';
 import { mockKibanaContext } from './kibana_context.mock';
-import { LicenseContext } from '../shared/licensing';
-import { mockLicenseContext } from './license_context.mock';
 
 /**
  * This helper mounts a component with all the contexts/providers used
@@ -34,9 +32,7 @@ export const mountWithContext = (children: React.ReactNode, context?: object) =>
   return mount(
     <I18nProvider>
       <KibanaContext.Provider value={{ ...mockKibanaContext, ...context }}>
-        <LicenseContext.Provider value={{ ...mockLicenseContext, ...context }}>
-          <Provider store={store}>{children}</Provider>
-        </LicenseContext.Provider>
+        <Provider store={store}>{children}</Provider>
       </KibanaContext.Provider>
     </I18nProvider>
   );

x-pack/plugins/enterprise_search/public/applications/__mocks__/shallow_usecontext.mock.ts

@@ -9,11 +9,10 @@
  * Jest to accept its use within a jest.mock()
  */
 import { mockKibanaContext } from './kibana_context.mock';
-import { mockLicenseContext } from './license_context.mock';
 
 jest.mock('react', () => ({
   ...(jest.requireActual('react') as object),
-  useContext: jest.fn(() => ({ ...mockKibanaContext, ...mockLicenseContext })),
+  useContext: jest.fn(() => ({ ...mockKibanaContext })),
   useEffect: jest.fn((fn) => fn()), // Calls on mount/every update - use mount for more complex behavior
 }));
 

x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx

@@ -82,9 +82,11 @@ describe('EngineOverview', () => {
 
     describe('when on a platinum license', () => {
       it('renders a 2nd meta engines table & makes a 2nd meta engines API call', async () => {
-        const wrapper = await mountWithAsyncContext(<EngineOverview />, {
-          license: { type: 'platinum', isActive: true },
+        setMockValues({
+          hasPlatinumLicense: true,
+          http: { ...mockHttpValues.http, get: mockApi },
         });
+        const wrapper = await mountWithAsyncContext(<EngineOverview />);
 
         expect(wrapper.find(EngineTable)).toHaveLength(2);
         expect(mockApi).toHaveBeenNthCalledWith(2, '/api/app_search/engines', {

x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useValues } from 'kea';
 import {
   EuiPageContent,
@@ -19,7 +19,7 @@ import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chro
 import { SendAppSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
 import { FlashMessages } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
-import { LicenseContext, ILicenseContext, hasPlatinumLicense } from '../../../shared/licensing';
+import { LicensingLogic } from '../../../shared/licensing';
 
 import { EngineIcon } from './assets/engine_icon';
 import { MetaEngineIcon } from './assets/meta_engine_icon';
@@ -40,7 +40,7 @@ interface ISetEnginesCallbacks {
 
 export const EngineOverview: React.FC = () => {
   const { http } = useValues(HttpLogic);
-  const { license } = useContext(LicenseContext) as ILicenseContext;
+  const { hasPlatinumLicense } = useValues(LicensingLogic);
 
   const [isLoading, setIsLoading] = useState(true);
   const [engines, setEngines] = useState([]);
@@ -72,13 +72,13 @@ export const EngineOverview: React.FC = () => {
   }, [enginesPage]);
 
   useEffect(() => {
-    if (hasPlatinumLicense(license)) {
+    if (hasPlatinumLicense) {
       const params = { type: 'meta', pageIndex: metaEnginesPage };
       const callbacks = { setResults: setMetaEngines, setResultsTotal: setMetaEnginesTotal };
 
       setEnginesData(params, callbacks);
     }
-  }, [license, metaEnginesPage]);
+  }, [hasPlatinumLicense, metaEnginesPage]);
 
   if (isLoading) return <LoadingState />;
   if (!engines.length) return <EmptyState />;