`;
-
-exports[`should render a Welcome screen with the telemetry disclaimer 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`should render a Welcome screen with the telemetry disclaimer when optIn is false 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`should render a Welcome screen with the telemetry disclaimer when optIn is true 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`should render a Welcome screen without the opt in/out link when user cannot change optIn status 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/src/plugins/home/public/application/components/home.test.tsx b/src/plugins/home/public/application/components/home.test.tsx
index 9983afa3d4d611..f27a286488c2b1 100644
--- a/src/plugins/home/public/application/components/home.test.tsx
+++ b/src/plugins/home/public/application/components/home.test.tsx
@@ -12,7 +12,6 @@ import type { HomeProps } from './home';
import { Home } from './home';
import { FeatureCatalogueCategory } from '../../services';
-import { telemetryPluginMock } from '../../../../telemetry/public/mocks';
import { Welcome } from './welcome';
let mockHasIntegrationsPermission = true;
@@ -57,7 +56,6 @@ describe('home', () => {
setItem: jest.fn(),
},
urlBasePath: 'goober',
- telemetry: telemetryPluginMock.createStartContract(),
addBasePath(url) {
return `base_path/${url}`;
},
diff --git a/src/plugins/home/public/application/components/home.tsx b/src/plugins/home/public/application/components/home.tsx
index fdf04ea5806538..1fb0b3c790ab7e 100644
--- a/src/plugins/home/public/application/components/home.tsx
+++ b/src/plugins/home/public/application/components/home.tsx
@@ -10,7 +10,6 @@ import React, { Component } from 'react';
import { FormattedMessage } from '@kbn/i18n-react';
import { METRIC_TYPE } from '@kbn/analytics';
import { i18n } from '@kbn/i18n';
-import type { TelemetryPluginStart } from 'src/plugins/telemetry/public';
import { KibanaPageTemplate, OverviewPageFooter } from '../../../../kibana_react/public';
import { HOME_APP_BASE_PATH } from '../../../common/constants';
import type { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../services';
@@ -29,7 +28,6 @@ export interface HomeProps {
solutions: FeatureCatalogueSolution[];
localStorage: Storage;
urlBasePath: string;
- telemetry: TelemetryPluginStart;
hasUserDataView: () => Promise
;
}
@@ -175,13 +173,7 @@ export class Home extends Component {
}
private renderWelcome() {
- return (
- this.skipWelcome()}
- urlBasePath={this.props.urlBasePath}
- telemetry={this.props.telemetry}
- />
- );
+ return this.skipWelcome()} urlBasePath={this.props.urlBasePath} />;
}
public render() {
diff --git a/src/plugins/home/public/application/components/home_app.js b/src/plugins/home/public/application/components/home_app.js
index 62df479ecbfdf6..a634573aaf21ec 100644
--- a/src/plugins/home/public/application/components/home_app.js
+++ b/src/plugins/home/public/application/components/home_app.js
@@ -26,7 +26,6 @@ export function HomeApp({ directories, solutions }) {
getBasePath,
addBasePath,
environmentService,
- telemetry,
dataViewsService,
} = getServices();
const environment = environmentService.getEnvironment();
@@ -75,7 +74,6 @@ export function HomeApp({ directories, solutions }) {
solutions={solutions}
localStorage={localStorage}
urlBasePath={getBasePath()}
- telemetry={telemetry}
hasUserDataView={() => dataViewsService.hasUserDataView()}
/>
diff --git a/src/plugins/home/public/application/components/welcome.test.mocks.ts b/src/plugins/home/public/application/components/welcome.test.mocks.ts
new file mode 100644
index 00000000000000..fc9854bae31990
--- /dev/null
+++ b/src/plugins/home/public/application/components/welcome.test.mocks.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { welcomeServiceMock } from '../../services/welcome/welcome_service.mocks';
+
+jest.doMock('../kibana_services', () => ({
+ getServices: () => ({
+ addBasePath: (path: string) => `root${path}`,
+ trackUiMetric: () => {},
+ welcomeService: welcomeServiceMock.create(),
+ }),
+}));
diff --git a/src/plugins/home/public/application/components/welcome.test.tsx b/src/plugins/home/public/application/components/welcome.test.tsx
index b042a91e58c9d2..3400b4bfcdb75f 100644
--- a/src/plugins/home/public/application/components/welcome.test.tsx
+++ b/src/plugins/home/public/application/components/welcome.test.tsx
@@ -8,58 +8,11 @@
import React from 'react';
import { shallow } from 'enzyme';
+import './welcome.test.mocks';
import { Welcome } from './welcome';
-import { telemetryPluginMock } from '../../../../telemetry/public/mocks';
-jest.mock('../kibana_services', () => ({
- getServices: () => ({
- addBasePath: (path: string) => `root${path}`,
- trackUiMetric: () => {},
- }),
-}));
-
-test('should render a Welcome screen with the telemetry disclaimer', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('should render a Welcome screen with the telemetry disclaimer when optIn is true', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- telemetry.telemetryService.getIsOptedIn = jest.fn().mockReturnValue(true);
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('should render a Welcome screen with the telemetry disclaimer when optIn is false', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- telemetry.telemetryService.getIsOptedIn = jest.fn().mockReturnValue(false);
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('should render a Welcome screen with no telemetry disclaimer', () => {
+test('should render a Welcome screen', () => {
const component = shallow( {}} />);
expect(component).toMatchSnapshot();
});
-
-test('should render a Welcome screen without the opt in/out link when user cannot change optIn status', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- telemetry.telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(false);
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('fires opt-in seen when mounted', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- const mockSetOptedInNoticeSeen = jest.fn();
- telemetry.telemetryNotifications.setOptedInNoticeSeen = mockSetOptedInNoticeSeen;
- shallow( {}} telemetry={telemetry} />);
-
- expect(mockSetOptedInNoticeSeen).toHaveBeenCalled();
-});
diff --git a/src/plugins/home/public/application/components/welcome.tsx b/src/plugins/home/public/application/components/welcome.tsx
index 1a6251ebdca118..9efa6d356d9716 100644
--- a/src/plugins/home/public/application/components/welcome.tsx
+++ b/src/plugins/home/public/application/components/welcome.tsx
@@ -12,27 +12,17 @@
* in Elasticsearch.
*/
-import React, { Fragment } from 'react';
-import {
- EuiLink,
- EuiTextColor,
- EuiTitle,
- EuiSpacer,
- EuiFlexGroup,
- EuiFlexItem,
- EuiIcon,
- EuiPortal,
-} from '@elastic/eui';
+import React from 'react';
+import { EuiTitle, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiPortal } from '@elastic/eui';
import { METRIC_TYPE } from '@kbn/analytics';
import { FormattedMessage } from '@kbn/i18n-react';
import { getServices } from '../kibana_services';
-import { TelemetryPluginStart } from '../../../../telemetry/public';
import { SampleDataCard } from './sample_data';
+
interface Props {
urlBasePath: string;
onSkip: () => void;
- telemetry?: TelemetryPluginStart;
}
/**
@@ -47,7 +37,7 @@ export class Welcome extends React.Component {
}
};
- private redirecToAddData() {
+ private redirectToAddData() {
this.services.application.navigateToApp('integrations', { path: '/browse' });
}
@@ -58,68 +48,23 @@ export class Welcome extends React.Component {
private onSampleDataConfirm = () => {
this.services.trackUiMetric(METRIC_TYPE.CLICK, 'sampleDataConfirm');
- this.redirecToAddData();
+ this.redirectToAddData();
};
componentDidMount() {
- const { telemetry } = this.props;
+ const { welcomeService } = this.services;
this.services.trackUiMetric(METRIC_TYPE.LOADED, 'welcomeScreenMount');
- if (telemetry?.telemetryService.userCanChangeSettings) {
- telemetry.telemetryNotifications.setOptedInNoticeSeen();
- }
document.addEventListener('keydown', this.hideOnEsc);
+ welcomeService.onRendered();
}
componentWillUnmount() {
document.removeEventListener('keydown', this.hideOnEsc);
}
- private renderTelemetryEnabledOrDisabledText = () => {
- const { telemetry } = this.props;
- if (
- !telemetry ||
- !telemetry.telemetryService.userCanChangeSettings ||
- !telemetry.telemetryService.getCanChangeOptInStatus()
- ) {
- return null;
- }
-
- const isOptedIn = telemetry.telemetryService.getIsOptedIn();
- if (isOptedIn) {
- return (
-
-
-
-
-
-
- );
- } else {
- return (
-
-
-
-
-
-
- );
- }
- };
-
render() {
- const { urlBasePath, telemetry } = this.props;
+ const { urlBasePath } = this.props;
+ const { welcomeService } = this.services;
return (
@@ -146,28 +91,7 @@ export class Welcome extends React.Component
{
onDecline={this.onSampleDataDecline}
/>
- {!!telemetry && (
-
-
-
-
-
-
- {this.renderTelemetryEnabledOrDisabledText()}
-
-
-
- )}
+ {welcomeService.renderTelemetryNotice()}
{engineName}
+
+
+
+
+ {i18n.translate('xpack.enterpriseSearch.appSearch.engines.auditLogsModal.eventTip', {
+ defaultMessage: 'Showing events from last 24 hours',
+ })}
+
+
+
+
+
+
+
+ {i18n.translate('xpack.enterpriseSearch.appSearch.engines.auditLogsModal.closeButton', {
+ defaultMessage: 'Close',
+ })}
+
+
+
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/audit_logs_modal/audit_logs_modal_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/audit_logs_modal/audit_logs_modal_logic.test.ts
new file mode 100644
index 00000000000000..f869dd145087d3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/audit_logs_modal/audit_logs_modal_logic.test.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { LogicMounter } from '../../../../../__mocks__/kea_logic';
+
+import { AuditLogsModalLogic } from './audit_logs_modal_logic';
+
+describe('AuditLogsModalLogic', () => {
+ const { mount } = new LogicMounter(AuditLogsModalLogic);
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ mount();
+ });
+
+ it('has excepted default values', () => {
+ expect(AuditLogsModalLogic.values).toEqual({
+ isModalVisible: false,
+ engineName: '',
+ });
+ });
+
+ describe('actions', () => {
+ describe('hideModal', () => {
+ it('hides the modal', () => {
+ mount({
+ isModalVisible: true,
+ engineName: 'test_engine',
+ });
+
+ AuditLogsModalLogic.actions.hideModal();
+ expect(AuditLogsModalLogic.values).toEqual({
+ isModalVisible: false,
+ engineName: '',
+ });
+ });
+ });
+
+ describe('showModal', () => {
+ it('show the modal with correct engine name', () => {
+ AuditLogsModalLogic.actions.showModal('test-engine-123');
+ expect(AuditLogsModalLogic.values).toEqual({
+ isModalVisible: true,
+ engineName: 'test-engine-123',
+ });
+ });
+ });
+ });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/audit_logs_modal/audit_logs_modal_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/audit_logs_modal/audit_logs_modal_logic.ts
new file mode 100644
index 00000000000000..afa70b4f3dee0e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/audit_logs_modal/audit_logs_modal_logic.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { kea } from 'kea';
+
+export const AuditLogsModalLogic = kea({
+ path: ['enterprise_search', 'app_search', 'engines_overview', 'audit_logs_modal'],
+ actions: () => ({
+ hideModal: true,
+ showModal: (engineName: string) => ({ engineName }),
+ }),
+ reducers: () => ({
+ isModalVisible: [
+ false,
+ {
+ showModal: () => true,
+ hideModal: () => false,
+ },
+ ],
+ engineName: [
+ '',
+ {
+ showModal: (_, { engineName }) => engineName,
+ hideModal: () => '',
+ },
+ ],
+ }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.tsx
index a3350d1ef9939c..229e0def4700e9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.tsx
@@ -7,11 +7,14 @@
import React from 'react';
+import { EuiLink } from '@elastic/eui';
+
import { KibanaLogic } from '../../../../../shared/kibana';
import { EuiLinkTo } from '../../../../../shared/react_router_helpers';
import { TelemetryLogic } from '../../../../../shared/telemetry';
import { ENGINE_PATH } from '../../../../routes';
import { generateEncodedPath } from '../../../../utils/encode_path_params';
+import { FormattedDateTime } from '../../../../utils/formatted_date_time';
const sendEngineTableLinkClickTelemetry = () => {
TelemetryLogic.actions.sendAppSearchTelemetry({
@@ -34,3 +37,9 @@ export const renderEngineLink = (engineName: string) => (
{engineName}
);
+
+export const renderLastChangeLink = (dateString: string, onClick = () => {}) => (
+
+ {!dateString ? '-' : }
+
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.tsx
index 563e272a4a7303..5e6ece1003e7fc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.tsx
@@ -7,7 +7,7 @@
import React from 'react';
-import { useValues } from 'kea';
+import { useActions, useValues } from 'kea';
import { EuiBasicTable, EuiBasicTableColumn, EuiTableFieldDataColumnType } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
@@ -16,10 +16,13 @@ import { AppLogic } from '../../../../app_logic';
import { UNIVERSAL_LANGUAGE } from '../../../../constants';
import { EngineDetails } from '../../../engine/types';
-import { renderEngineLink } from './engine_link_helpers';
+import { AuditLogsModalLogic } from '../audit_logs_modal/audit_logs_modal_logic';
+
+import { renderEngineLink, renderLastChangeLink } from './engine_link_helpers';
import {
ACTIONS_COLUMN,
CREATED_AT_COLUMN,
+ LAST_UPDATED_COLUMN,
DOCUMENT_COUNT_COLUMN,
FIELD_COUNT_COLUMN,
NAME_COLUMN,
@@ -46,12 +49,22 @@ export const EnginesTable: React.FC = ({
myRole: { canManageEngines },
} = useValues(AppLogic);
+ const { showModal: showAuditLogModal } = useActions(AuditLogsModalLogic);
+
const columns: Array> = [
{
...NAME_COLUMN,
render: (name: string) => renderEngineLink(name),
},
CREATED_AT_COLUMN,
+ {
+ ...LAST_UPDATED_COLUMN,
+ render: (dateString: string, engineDetails) => {
+ return renderLastChangeLink(dateString, () => {
+ showAuditLogModal(engineDetails.name);
+ });
+ },
+ },
LANGUAGE_COLUMN,
DOCUMENT_COUNT_COLUMN,
FIELD_COUNT_COLUMN,
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.tsx
index f99dc7e15eaec5..24eb8cc8a6b812 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.tsx
@@ -14,6 +14,9 @@ import { EuiBasicTable, EuiBasicTableColumn } from '@elastic/eui';
import { AppLogic } from '../../../../app_logic';
import { EngineDetails } from '../../../engine/types';
+import { AuditLogsModalLogic } from '../audit_logs_modal/audit_logs_modal_logic';
+
+import { renderLastChangeLink } from './engine_link_helpers';
import { MetaEnginesTableExpandedRow } from './meta_engines_table_expanded_row';
import { MetaEnginesTableLogic } from './meta_engines_table_logic';
import { MetaEnginesTableNameColumnContent } from './meta_engines_table_name_column_content';
@@ -21,6 +24,7 @@ import {
ACTIONS_COLUMN,
BLANK_COLUMN,
CREATED_AT_COLUMN,
+ LAST_UPDATED_COLUMN,
DOCUMENT_COUNT_COLUMN,
FIELD_COUNT_COLUMN,
NAME_COLUMN,
@@ -49,6 +53,8 @@ export const MetaEnginesTable: React.FC = ({
myRole: { canManageMetaEngines },
} = useValues(AppLogic);
+ const { showModal: showAuditLogModal } = useActions(AuditLogsModalLogic);
+
const conflictingEnginesSets: ConflictingEnginesSets = useMemo(
() =>
items.reduce((accumulator, metaEngine) => {
@@ -89,6 +95,14 @@ export const MetaEnginesTable: React.FC = ({
),
},
CREATED_AT_COLUMN,
+ {
+ ...LAST_UPDATED_COLUMN,
+ render: (dateString: string, engineDetails) => {
+ return renderLastChangeLink(dateString, () => {
+ showAuditLogModal(engineDetails.name);
+ });
+ },
+ },
BLANK_COLUMN,
DOCUMENT_COUNT_COLUMN,
FIELD_COUNT_COLUMN,
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
index 325760b641efdc..b0ca36a7778389 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
@@ -50,6 +50,17 @@ export const CREATED_AT_COLUMN: EuiTableFieldDataColumnType = {
render: (dateString: string) => ,
};
+export const LAST_UPDATED_COLUMN: EuiTableFieldDataColumnType = {
+ field: 'updated_at',
+ name: i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.enginesOverview.table.column.lastUpdated',
+ {
+ defaultMessage: 'Last updated',
+ }
+ ),
+ dataType: 'string',
+};
+
export const DOCUMENT_COUNT_COLUMN: EuiTableFieldDataColumnType = {
field: 'document_count',
name: i18n.translate(
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx
index f8df9f5abfaa54..27cdff5d69812e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx
@@ -21,6 +21,7 @@ import { DataPanel } from '../data_panel';
import { AppSearchPageTemplate } from '../layout';
import { EmptyState, EmptyMetaEnginesState } from './components';
+import { AuditLogsModal } from './components/audit_logs_modal/audit_logs_modal';
import { EnginesTable } from './components/tables/engines_table';
import { MetaEnginesTable } from './components/tables/meta_engines_table';
import {
@@ -144,6 +145,7 @@ export const EnginesOverview: React.FC = () => {
data-test-subj="metaEnginesLicenseCTA"
/>
)}
+
);
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
index 60d0dcc0c5911e..0d5e4e9824f170 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
@@ -23,6 +23,7 @@ describe('getRoleAbilities', () => {
// Has access
canViewAccountCredentials: true,
canManageEngines: true,
+ canManageMetaEngines: true,
// Does not have access
canViewMetaEngines: false,
canViewEngineAnalytics: false,
@@ -35,7 +36,6 @@ describe('getRoleAbilities', () => {
canViewMetaEngineSourceEngines: false,
canViewSettings: false,
canViewRoleMappings: false,
- canManageMetaEngines: false,
canManageLogSettings: false,
canManageSettings: false,
canManageEngineCrawler: false,
@@ -81,10 +81,10 @@ describe('getRoleAbilities', () => {
expect(myRole.canManageMetaEngines).toEqual(true);
});
- it('returns false when the user can manage any engines but the account does not have a platinum license', () => {
+ it('returns true when the user can manage any engines but the account does not have a platinum license', () => {
const myRole = getRoleAbilities({ ...mockRole, ...canManageEngines }, false);
- expect(myRole.canManageMetaEngines).toEqual(false);
+ expect(myRole.canManageMetaEngines).toEqual(true);
});
it('returns false when has a platinum license but the user cannot manage any engines', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.ts
index ef3e22d851f387..15cba16ab04345 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.ts
@@ -49,7 +49,7 @@ export const getRoleAbilities = (role: Account['role'], hasPlatinumLicense = fal
canViewSettings: myRole.can('view', 'account_settings'),
canViewRoleMappings: myRole.can('view', 'role_mappings'),
canManageEngines: myRole.can('manage', 'account_engines'),
- canManageMetaEngines: hasPlatinumLicense && myRole.can('manage', 'account_engines'),
+ canManageMetaEngines: myRole.can('manage', 'account_engines'),
canManageLogSettings: myRole.can('manage', 'account_log_settings'),
canManageSettings: myRole.can('manage', 'account_settings'),
canManageEngineCrawler: myRole.can('manage', 'engine_crawler'),
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx
index 4598ca337f4e2c..76c6c3cfa9d592 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx
@@ -27,6 +27,7 @@ import { staticSourceData } from '../../source_data';
import { AddSource } from './add_source';
import { AddSourceSteps } from './add_source_logic';
import { ConfigCompleted } from './config_completed';
+import { ConfigurationChoice } from './configuration_choice';
import { ConfigurationIntro } from './configuration_intro';
import { ConfigureOauth } from './configure_oauth';
import { ConnectInstance } from './connect_instance';
@@ -71,6 +72,22 @@ describe('AddSourceList', () => {
expect(setAddSourceStep).toHaveBeenCalledWith(AddSourceSteps.SaveConfigStep);
});
+ it('renders default state correctly when there are multiple connector options', () => {
+ const wrapper = shallow(
+
+ );
+ wrapper.find(ConfigurationIntro).prop('advanceStep')();
+
+ expect(setAddSourceStep).toHaveBeenCalledWith(AddSourceSteps.ChoiceStep);
+ });
+
describe('layout', () => {
it('renders the default workplace search layout when on an organization view', () => {
setMockValues({ ...mockValues, isOrganization: true });
@@ -153,4 +170,19 @@ describe('AddSourceList', () => {
expect(wrapper.find(Reauthenticate)).toHaveLength(1);
});
+
+ it('renders Config Choice step', () => {
+ setMockValues({
+ ...mockValues,
+ addSourceCurrentStep: AddSourceSteps.ChoiceStep,
+ });
+ const wrapper = shallow();
+ const advance = wrapper.find(ConfigurationChoice).prop('goToInternalStep');
+ expect(advance).toBeDefined();
+ if (advance) {
+ advance();
+ }
+
+ expect(setAddSourceStep).toHaveBeenCalledWith(AddSourceSteps.SaveConfigStep);
+ });
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.tsx
index 1e9be74224c5ed..f03c77290f22dd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.tsx
@@ -21,9 +21,12 @@ import {
import { NAV } from '../../../../constants';
import { SOURCES_PATH, getSourcesPath, getAddPath } from '../../../../routes';
+import { hasMultipleConnectorOptions } from '../../../../utils';
+
import { AddSourceHeader } from './add_source_header';
import { AddSourceLogic, AddSourceProps, AddSourceSteps } from './add_source_logic';
import { ConfigCompleted } from './config_completed';
+import { ConfigurationChoice } from './configuration_choice';
import { ConfigurationIntro } from './configuration_intro';
import { ConfigureOauth } from './configure_oauth';
import { ConnectInstance } from './connect_instance';
@@ -51,6 +54,7 @@ export const AddSource: React.FC = (props) => {
const goToSaveConfig = () => setAddSourceStep(AddSourceSteps.SaveConfigStep);
const setConfigCompletedStep = () => setAddSourceStep(AddSourceSteps.ConfigCompletedStep);
const goToConfigCompleted = () => saveSourceConfig(false, setConfigCompletedStep);
+ const goToChoice = () => setAddSourceStep(AddSourceSteps.ChoiceStep);
const FORM_SOURCE_ADDED_SUCCESS_MESSAGE = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.formSourceAddedSuccessMessage',
{
@@ -75,7 +79,11 @@ export const AddSource: React.FC = (props) => {
return (
{addSourceCurrentStep === AddSourceSteps.ConfigIntroStep && (
-
+
)}
{addSourceCurrentStep === AddSourceSteps.SaveConfigStep && (
= (props) => {
{addSourceCurrentStep === AddSourceSteps.ReauthenticateStep && (
)}
+ {addSourceCurrentStep === AddSourceSteps.ChoiceStep && (
+
+ )}
);
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts
index 80f8a2fc18218d..a633beac3a1c23 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts
@@ -664,11 +664,13 @@ describe('AddSourceLogic', () => {
});
it('handles error', async () => {
+ const setButtonNotLoadingSpy = jest.spyOn(AddSourceLogic.actions, 'setButtonNotLoading');
http.post.mockReturnValue(Promise.reject('this is an error'));
AddSourceLogic.actions.createContentSource(serviceType, successCallback, errorCallback);
await nextTick();
+ expect(setButtonNotLoadingSpy).toHaveBeenCalled();
expect(errorCallback).toHaveBeenCalled();
expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.ts
index db0c5b97372636..92fab713a3fa09 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.ts
@@ -41,6 +41,7 @@ export enum AddSourceSteps {
ConnectInstanceStep = 'Connect Instance',
ConfigureOauthStep = 'Configure Oauth',
ReauthenticateStep = 'Reauthenticate',
+ ChoiceStep = 'Choice',
}
export interface OauthParams {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.test.tsx
index bfb916847d865e..392ce175d271db 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.test.tsx
@@ -13,10 +13,6 @@ import { shallow } from 'enzyme';
import { EuiText, EuiButton } from '@elastic/eui';
-import {
- PersonalDashboardLayout,
- WorkplaceSearchPageTemplate,
-} from '../../../../components/layout';
import { staticSourceData } from '../../source_data';
import { ConfigurationChoice } from './configuration_choice';
@@ -35,22 +31,6 @@ describe('ConfigurationChoice', () => {
jest.clearAllMocks();
});
- describe('layout', () => {
- it('renders the default workplace search layout when on an organization view', () => {
- setMockValues({ ...mockValues, isOrganization: true });
- const wrapper = shallow();
-
- expect(wrapper.type()).toEqual(WorkplaceSearchPageTemplate);
- });
-
- it('renders the personal dashboard layout when not in an organization', () => {
- setMockValues({ ...mockValues, isOrganization: false });
- const wrapper = shallow();
-
- expect(wrapper.type()).toEqual(PersonalDashboardLayout);
- });
- });
-
it('renders internal connector if available', () => {
const wrapper = shallow();
@@ -64,6 +44,16 @@ describe('ConfigurationChoice', () => {
button.simulate('click');
expect(navigateToUrl).toHaveBeenCalledWith('/sources/add/box/internal/');
});
+ it('should call prop function when provided on internal connector click', () => {
+ const advanceSpy = jest.fn();
+ const wrapper = shallow(
+
+ );
+ const button = wrapper.find(EuiButton);
+ button.simulate('click');
+ expect(navigateToUrl).not.toHaveBeenCalled();
+ expect(advanceSpy).toHaveBeenCalled();
+ });
it('renders external connector if available', () => {
const wrapper = shallow(
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.tsx
index 46a8998c9dd10a..f5d6d51651dd4d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_choice.tsx
@@ -9,16 +9,11 @@ import React from 'react';
import { useValues } from 'kea';
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
+import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiPanel, EuiText } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { KibanaLogic } from '../../../../../shared/kibana';
import { AppLogic } from '../../../../app_logic';
-import {
- WorkplaceSearchPageTemplate,
- PersonalDashboardLayout,
-} from '../../../../components/layout';
-import { NAV } from '../../../../constants';
import { getAddPath, getSourcesPath } from '../../../../routes';
import { SourceDataItem } from '../../../../types';
@@ -26,6 +21,7 @@ import { AddSourceHeader } from './add_source_header';
interface ConfigurationIntroProps {
sourceData: SourceDataItem;
+ goToInternalStep?: () => void;
}
export const ConfigurationChoice: React.FC = ({
@@ -36,15 +32,18 @@ export const ConfigurationChoice: React.FC = ({
internalConnectorAvailable,
customConnectorAvailable,
},
+ goToInternalStep,
}) => {
const { isOrganization } = useValues(AppLogic);
- const goToInternal = () =>
- KibanaLogic.values.navigateToUrl(
- `${getSourcesPath(
- `${getSourcesPath(getAddPath(serviceType), isOrganization)}/internal`,
- isOrganization
- )}/`
- );
+ const goToInternal = goToInternalStep
+ ? goToInternalStep
+ : () =>
+ KibanaLogic.values.navigateToUrl(
+ `${getSourcesPath(
+ `${getSourcesPath(getAddPath(serviceType), isOrganization)}/internal`,
+ isOrganization
+ )}/`
+ );
const goToExternal = () =>
KibanaLogic.values.navigateToUrl(
`${getSourcesPath(
@@ -59,12 +58,10 @@ export const ConfigurationChoice: React.FC = ({
isOrganization
)}/`
);
- const Layout = isOrganization ? WorkplaceSearchPageTemplate : PersonalDashboardLayout;
return (
-
+ <>
-
= ({
)}
-
+
);
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
index 0ee80019ea720e..0ae176dbef019f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
@@ -36,9 +36,8 @@ describe('ConnectInstance', () => {
const getSourceConnectData = jest.fn((_, redirectOauth) => {
redirectOauth();
});
- const createContentSource = jest.fn((_, redirectFormCreated, handleFormSubmitError) => {
+ const createContentSource = jest.fn((_, redirectFormCreated) => {
redirectFormCreated();
- handleFormSubmitError();
});
const credentialsSourceData = staticSourceData[13];
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx
index a9e24c7b944aba..352addd8176d84 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import React, { useState, useEffect, FormEvent } from 'react';
+import React, { useEffect, FormEvent } from 'react';
import { useActions, useValues } from 'kea';
@@ -51,8 +51,6 @@ export const ConnectInstance: React.FC = ({
onFormCreated,
header,
}) => {
- const [formLoading, setFormLoading] = useState(false);
-
const { hasPlatinumLicense } = useValues(LicensingLogic);
const {
@@ -64,7 +62,7 @@ export const ConnectInstance: React.FC = ({
setSourceIndexPermissionsValue,
} = useActions(AddSourceLogic);
- const { loginValue, passwordValue, indexPermissionsValue, subdomainValue } =
+ const { buttonLoading, loginValue, passwordValue, indexPermissionsValue, subdomainValue } =
useValues(AddSourceLogic);
const { isOrganization } = useValues(AppLogic);
@@ -77,12 +75,9 @@ export const ConnectInstance: React.FC = ({
const redirectOauth = (oauthUrl: string) => window.location.replace(oauthUrl);
const redirectFormCreated = () => onFormCreated(name);
const onOauthFormSubmit = () => getSourceConnectData(serviceType, redirectOauth);
- const handleFormSubmitError = () => setFormLoading(false);
- const onCredentialsFormSubmit = () =>
- createContentSource(serviceType, redirectFormCreated, handleFormSubmitError);
+ const onCredentialsFormSubmit = () => createContentSource(serviceType, redirectFormCreated);
const handleFormSubmit = (e: FormEvent) => {
- setFormLoading(true);
e.preventDefault();
const onSubmit = hasOauthRedirect ? onOauthFormSubmit : onCredentialsFormSubmit;
onSubmit();
@@ -145,7 +140,7 @@ export const ConnectInstance: React.FC = ({
{permissionsExcluded && !hasPlatinumLicense && }
-
+
{i18n.translate('xpack.enterpriseSearch.workplaceSearch.contentSource.connect.button', {
defaultMessage: 'Connect {name}',
values: { name },
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.tsx
index c2cd58a90f209d..e735119f687cc1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.tsx
@@ -90,9 +90,10 @@ export const SourcesRouter: React.FC = () => {
: externalConnectorAvailable
? 'external'
: 'custom';
+ const showChoice = defaultOption !== 'internal' && hasMultipleConnectorOptions(sourceData);
return (
- {hasMultipleConnectorOptions(sourceData) ? (
+ {showChoice ? (
) : (
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index ef9a0cea9da60f..f393ca59a44118 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -27,6 +27,7 @@ import {
APP_SEARCH_PLUGIN,
WORKPLACE_SEARCH_PLUGIN,
LOGS_SOURCE_ID,
+ ENTERPRISE_SEARCH_AUDIT_LOGS_SOURCE_ID,
} from '../common/constants';
import { registerTelemetryUsageCollector as registerASTelemetryUsageCollector } from './collectors/app_search/telemetry';
@@ -185,6 +186,14 @@ export class EnterpriseSearchPlugin implements Plugin {
indexName: '.ent-search-*',
},
});
+
+ infra.defineInternalSourceConfiguration(ENTERPRISE_SEARCH_AUDIT_LOGS_SOURCE_ID, {
+ name: 'Enterprise Search Audit Logs',
+ logIndices: {
+ type: 'index_name',
+ indexName: 'logs-enterprise_search*',
+ },
+ });
}
public start() {}
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
new file mode 100644
index 00000000000000..51aee45c83cf3d
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type {
+ ISavedObjectsImporter,
+ SavedObjectsImportFailure,
+ SavedObjectsImportSuccess,
+ SavedObjectsImportResponse,
+} from 'src/core/server';
+
+import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+
+import type { ArchiveAsset } from './install';
+
+jest.mock('timers/promises', () => ({
+ async setTimeout() {},
+}));
+
+import { installKibanaSavedObjects } from './install';
+
+const mockLogger = loggingSystemMock.createLogger();
+
+const mockImporter: jest.Mocked = {
+ import: jest.fn(),
+ resolveImportErrors: jest.fn(),
+};
+
+const createImportError = (so: ArchiveAsset, type: string) =>
+ ({ id: so.id, error: { type } } as SavedObjectsImportFailure);
+const createImportSuccess = (so: ArchiveAsset) =>
+ ({ id: so.id, type: so.type, meta: {} } as SavedObjectsImportSuccess);
+const createAsset = (asset: Partial) =>
+ ({ id: 1234, type: 'dashboard', attributes: {}, ...asset } as ArchiveAsset);
+
+const createImportResponse = (
+ errors: SavedObjectsImportFailure[] = [],
+ successResults: SavedObjectsImportSuccess[] = []
+) =>
+ ({
+ success: !!successResults.length,
+ errors,
+ successResults,
+ warnings: [],
+ successCount: successResults.length,
+ } as SavedObjectsImportResponse);
+
+describe('installKibanaSavedObjects', () => {
+ beforeEach(() => {
+ mockImporter.import.mockReset();
+ mockImporter.resolveImportErrors.mockReset();
+ });
+
+ it('should retry on conflict error', async () => {
+ const asset = createAsset({ attributes: { hello: 'world' } });
+ const conflictResponse = createImportResponse([createImportError(asset, 'conflict')]);
+ const successResponse = createImportResponse([], [createImportSuccess(asset)]);
+
+ mockImporter.import
+ .mockResolvedValueOnce(conflictResponse)
+ .mockResolvedValueOnce(successResponse);
+
+ await installKibanaSavedObjects({
+ savedObjectsImporter: mockImporter,
+ logger: mockLogger,
+ kibanaAssets: [asset],
+ });
+
+ expect(mockImporter.import).toHaveBeenCalledTimes(2);
+ });
+
+ it('should give up after 50 retries on conflict errors', async () => {
+ const asset = createAsset({ attributes: { hello: 'world' } });
+ const conflictResponse = createImportResponse([createImportError(asset, 'conflict')]);
+
+ mockImporter.import.mockImplementation(() => Promise.resolve(conflictResponse));
+
+ await expect(
+ installKibanaSavedObjects({
+ savedObjectsImporter: mockImporter,
+ logger: mockLogger,
+ kibanaAssets: [asset],
+ })
+ ).rejects.toEqual(expect.any(Error));
+ expect(mockImporter.import).toHaveBeenCalledTimes(51);
+ });
+ it('should not retry errors that arent conflict errors', async () => {
+ const asset = createAsset({ attributes: { hello: 'world' } });
+ const errorResponse = createImportResponse([createImportError(asset, 'something_bad')]);
+ const successResponse = createImportResponse([], [createImportSuccess(asset)]);
+
+ mockImporter.import.mockResolvedValueOnce(errorResponse).mockResolvedValueOnce(successResponse);
+
+ expect(
+ installKibanaSavedObjects({
+ savedObjectsImporter: mockImporter,
+ logger: mockLogger,
+ kibanaAssets: [asset],
+ })
+ ).rejects.toEqual(expect.any(Error));
+ });
+
+ it('should resolve reference errors', async () => {
+ const asset = createAsset({ attributes: { hello: 'world' } });
+ const referenceErrorResponse = createImportResponse([
+ createImportError(asset, 'missing_references'),
+ ]);
+ const successResponse = createImportResponse([], [createImportSuccess(asset)]);
+
+ mockImporter.import.mockResolvedValueOnce(referenceErrorResponse);
+ mockImporter.resolveImportErrors.mockResolvedValueOnce(successResponse);
+
+ await installKibanaSavedObjects({
+ savedObjectsImporter: mockImporter,
+ logger: mockLogger,
+ kibanaAssets: [asset],
+ });
+
+ expect(mockImporter.import).toHaveBeenCalledTimes(1);
+ expect(mockImporter.resolveImportErrors).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
index 5ab15a1f52e755..d654fab427f198 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
@@ -5,6 +5,8 @@
* 2.0.
*/
+import { setTimeout } from 'timers/promises';
+
import type {
SavedObject,
SavedObjectsBulkCreateObject,
@@ -13,7 +15,6 @@ import type {
Logger,
} from 'src/core/server';
import type { SavedObjectsImportSuccess, SavedObjectsImportFailure } from 'src/core/server/types';
-
import { createListStream } from '@kbn/utils';
import { partition } from 'lodash';
@@ -166,7 +167,40 @@ export async function getKibanaAssets(
return result;
}
-async function installKibanaSavedObjects({
+const isImportConflictError = (e: SavedObjectsImportFailure) => e?.error?.type === 'conflict';
+/**
+ * retry saved object import if only conflict errors are encountered
+ */
+async function retryImportOnConflictError(
+ importCall: () => ReturnType,
+ {
+ logger,
+ maxAttempts = 50,
+ _attempt = 0,
+ }: { logger?: Logger; _attempt?: number; maxAttempts?: number } = {}
+): ReturnType {
+ const result = await importCall();
+
+ const errors = result.errors ?? [];
+ if (_attempt < maxAttempts && errors.length && errors.every(isImportConflictError)) {
+ const retryCount = _attempt + 1;
+ const retryDelayMs = 1000 + Math.floor(Math.random() * 3000); // 1s + 0-3s of jitter
+
+ logger?.debug(
+ `Retrying import operation after [${
+ retryDelayMs * 1000
+ }s] due to conflict errors: ${JSON.stringify(errors)}`
+ );
+
+ await setTimeout(retryDelayMs);
+ return retryImportOnConflictError(importCall, { logger, _attempt: retryCount });
+ }
+
+ return result;
+}
+
+// only exported for testing
+export async function installKibanaSavedObjects({
savedObjectsImporter,
kibanaAssets,
logger,
@@ -185,18 +219,19 @@ async function installKibanaSavedObjects({
return [];
} else {
const { successResults: importSuccessResults = [], errors: importErrors = [] } =
- await savedObjectsImporter.import({
- overwrite: true,
- readStream: createListStream(toBeSavedObjects),
- createNewCopies: false,
- });
+ await retryImportOnConflictError(() =>
+ savedObjectsImporter.import({
+ overwrite: true,
+ readStream: createListStream(toBeSavedObjects),
+ createNewCopies: false,
+ })
+ );
allSuccessResults = importSuccessResults;
const [referenceErrors, otherErrors] = partition(
importErrors,
(e) => e?.error?.type === 'missing_references'
);
-
if (otherErrors?.length) {
throw new Error(
`Encountered ${
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx b/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
index 482a5b931ed78a..f44aef76ab83d4 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
@@ -11,6 +11,7 @@ import type { Action, UiActionsStart } from 'src/plugins/ui_actions/public';
import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
import { EuiLoadingChart } from '@elastic/eui';
import {
+ EmbeddableFactory,
EmbeddableInput,
EmbeddableOutput,
EmbeddablePanel,
@@ -69,41 +70,48 @@ interface PluginsStartDependencies {
}
export function getEmbeddableComponent(core: CoreStart, plugins: PluginsStartDependencies) {
+ const { embeddable: embeddableStart, uiActions, inspector } = plugins;
+ const factory = embeddableStart.getEmbeddableFactory('lens')!;
+ const theme = core.theme;
return (props: EmbeddableComponentProps) => {
- const { embeddable: embeddableStart, uiActions, inspector } = plugins;
- const factory = embeddableStart.getEmbeddableFactory('lens')!;
const input = { ...props };
- const [embeddable, loading, error] = useEmbeddableFactory({ factory, input });
const hasActions =
- Boolean(props.withDefaultActions) || (props.extraActions && props.extraActions?.length > 0);
+ Boolean(input.withDefaultActions) || (input.extraActions && input.extraActions?.length > 0);
- const theme = core.theme;
-
- if (loading) {
- return ;
- }
-
- if (embeddable && hasActions) {
+ if (hasActions) {
return (
}
+ factory={factory}
uiActions={uiActions}
inspector={inspector}
actionPredicate={() => hasActions}
input={input}
theme={theme}
- extraActions={props.extraActions}
- withDefaultActions={props.withDefaultActions}
+ extraActions={input.extraActions}
+ withDefaultActions={input.withDefaultActions}
/>
);
}
-
- return ;
+ return ;
};
}
+function EmbeddableRootWrapper({
+ factory,
+ input,
+}: {
+ factory: EmbeddableFactory;
+ input: EmbeddableComponentProps;
+}) {
+ const [embeddable, loading, error] = useEmbeddableFactory({ factory, input });
+ if (loading) {
+ return ;
+ }
+ return ;
+}
+
interface EmbeddablePanelWrapperProps {
- embeddable: IEmbeddable;
+ factory: EmbeddableFactory;
uiActions: PluginsStartDependencies['uiActions'];
inspector: PluginsStartDependencies['inspector'];
actionPredicate: (id: string) => boolean;
@@ -114,7 +122,7 @@ interface EmbeddablePanelWrapperProps {
}
const EmbeddablePanelWrapper: FC = ({
- embeddable,
+ factory,
uiActions,
actionPredicate,
inspector,
@@ -123,10 +131,17 @@ const EmbeddablePanelWrapper: FC = ({
extraActions,
withDefaultActions,
}) => {
+ const [embeddable, loading] = useEmbeddableFactory({ factory, input });
useEffect(() => {
- embeddable.updateInput(input);
+ if (embeddable) {
+ embeddable.updateInput(input);
+ }
}, [embeddable, input]);
+ if (loading || !embeddable) {
+ return ;
+ }
+
return (
) {
return async (
dispatch: ThunkDispatch,
getState: () => MapStoreState
@@ -369,7 +375,10 @@ export function addNewFeatureToIndex(geometry: Geometry | Position[]) {
}
try {
- await (layer as IVectorLayer).addFeature(geometry);
+ dispatch(updateEditShape(DRAW_SHAPE.WAIT));
+ await asyncForEach(geometries, async (geometry) => {
+ await (layer as IVectorLayer).addFeature(geometry);
+ });
await dispatch(syncDataForLayerDueToDrawing(layer));
} catch (e) {
getToasts().addError(e, {
@@ -378,6 +387,7 @@ export function addNewFeatureToIndex(geometry: Geometry | Position[]) {
}),
});
}
+ dispatch(updateEditShape(DRAW_SHAPE.SIMPLE_SELECT));
};
}
@@ -386,6 +396,12 @@ export function deleteFeatureFromIndex(featureId: string) {
dispatch: ThunkDispatch,
getState: () => MapStoreState
) => {
+ // There is a race condition where users can click on a previously deleted feature before layer has re-rendered after feature delete.
+ // Check ensures delete requests for previously deleted features are aborted.
+ if (getDeletedFeatureIds(getState()).includes(featureId)) {
+ return;
+ }
+
const editState = getEditState(getState());
const layerId = editState ? editState.layerId : undefined;
if (!layerId) {
@@ -395,8 +411,11 @@ export function deleteFeatureFromIndex(featureId: string) {
if (!layer || !isVectorLayer(layer)) {
return;
}
+
try {
+ dispatch(updateEditShape(DRAW_SHAPE.WAIT));
await (layer as IVectorLayer).deleteFeature(featureId);
+ dispatch(pushDeletedFeatureId(featureId));
await dispatch(syncDataForLayerDueToDrawing(layer));
} catch (e) {
getToasts().addError(e, {
@@ -405,5 +424,6 @@ export function deleteFeatureFromIndex(featureId: string) {
}),
});
}
+ dispatch(updateEditShape(DRAW_SHAPE.DELETE));
};
}
diff --git a/x-pack/plugins/maps/public/actions/ui_actions.ts b/x-pack/plugins/maps/public/actions/ui_actions.ts
index 70e24283ef48f7..1ffcf416f6f8fa 100644
--- a/x-pack/plugins/maps/public/actions/ui_actions.ts
+++ b/x-pack/plugins/maps/public/actions/ui_actions.ts
@@ -24,6 +24,8 @@ export const SET_OPEN_TOC_DETAILS = 'SET_OPEN_TOC_DETAILS';
export const SHOW_TOC_DETAILS = 'SHOW_TOC_DETAILS';
export const HIDE_TOC_DETAILS = 'HIDE_TOC_DETAILS';
export const SET_DRAW_MODE = 'SET_DRAW_MODE';
+export const PUSH_DELETED_FEATURE_ID = 'PUSH_DELETED_FEATURE_ID';
+export const CLEAR_DELETED_FEATURE_IDS = 'CLEAR_DELETED_FEATURE_IDS';
export function exitFullScreen() {
return {
@@ -123,3 +125,16 @@ export function closeTimeslider() {
dispatch(setQuery({ clearTimeslice: true }));
};
}
+
+export function pushDeletedFeatureId(featureId: string) {
+ return {
+ type: PUSH_DELETED_FEATURE_ID,
+ featureId,
+ };
+}
+
+export function clearDeletedFeatureIds() {
+ return {
+ type: CLEAR_DELETED_FEATURE_IDS,
+ };
+}
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx
index a404db91a942ef..8cbfcd3a41e80e 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx
@@ -20,15 +20,6 @@ import { DRAW_SHAPE } from '../../../../common/constants';
import { DrawCircle, DRAW_CIRCLE_RADIUS_LABEL_STYLE } from './draw_circle';
import { DrawTooltip } from './draw_tooltip';
-const mbModeEquivalencies = new Map([
- ['simple_select', DRAW_SHAPE.SIMPLE_SELECT],
- ['draw_rectangle', DRAW_SHAPE.BOUNDS],
- ['draw_circle', DRAW_SHAPE.DISTANCE],
- ['draw_polygon', DRAW_SHAPE.POLYGON],
- ['draw_line_string', DRAW_SHAPE.LINE],
- ['draw_point', DRAW_SHAPE.POINT],
-]);
-
const DRAW_RECTANGLE = 'draw_rectangle';
const DRAW_CIRCLE = 'draw_circle';
const mbDrawModes = MapboxDraw.modes;
@@ -41,7 +32,6 @@ export interface Props {
onClick?: (event: MapMouseEvent, drawControl?: MapboxDraw) => void;
mbMap: MbMap;
enable: boolean;
- updateEditShape: (shapeToDraw: DRAW_SHAPE) => void;
}
export class DrawControl extends Component {
@@ -91,12 +81,6 @@ export class DrawControl extends Component {
}
}, 0);
- _onModeChange = ({ mode }: { mode: string }) => {
- if (mbModeEquivalencies.has(mode)) {
- this.props.updateEditShape(mbModeEquivalencies.get(mode)!);
- }
- };
-
_removeDrawControl() {
// Do not remove draw control after mbMap.remove is called, causes execeptions and mbMap.remove cleans up all map resources.
const isMapRemoved = !this.props.mbMap.loaded();
@@ -105,7 +89,6 @@ export class DrawControl extends Component {
}
this.props.mbMap.getCanvas().style.cursor = '';
- this.props.mbMap.off('draw.modechange', this._onModeChange);
this.props.mbMap.off('draw.create', this._onDraw);
if (this.props.onClick) {
this.props.mbMap.off('click', this._onClick);
@@ -118,7 +101,6 @@ export class DrawControl extends Component {
if (!this._mbDrawControlAdded) {
this.props.mbMap.addControl(this._mbDrawControl);
this._mbDrawControlAdded = true;
- this.props.mbMap.on('draw.modechange', this._onModeChange);
this.props.mbMap.on('draw.create', this._onDraw);
if (this.props.onClick) {
@@ -144,6 +126,9 @@ export class DrawControl extends Component {
this._mbDrawControl.changeMode(DRAW_POINT);
} else if (this.props.drawShape === DRAW_SHAPE.DELETE) {
this._mbDrawControl.changeMode(SIMPLE_SELECT);
+ } else if (this.props.drawShape === DRAW_SHAPE.WAIT) {
+ this.props.mbMap.getCanvas().style.cursor = 'wait';
+ this._mbDrawControl.changeMode(SIMPLE_SELECT);
} else {
this._mbDrawControl.changeMode(SIMPLE_SELECT);
}
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
index 6c7fe9f0ad213a..b6ffacc491030e 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
@@ -15,7 +15,7 @@ import { i18n } from '@kbn/i18n';
import * as jsts from 'jsts';
import { MapMouseEvent } from '@kbn/mapbox-gl';
import { getToasts } from '../../../../kibana_services';
-import { DrawControl } from '../';
+import { DrawControl } from '../draw_control';
import { DRAW_MODE, DRAW_SHAPE } from '../../../../../common/constants';
import { ILayer } from '../../../../classes/layers/layer';
import { EXCLUDE_CENTROID_FEATURES } from '../../../../classes/util/mb_filter_expressions';
@@ -29,9 +29,8 @@ export interface ReduxStateProps {
}
export interface ReduxDispatchProps {
- addNewFeatureToIndex: (geometry: Geometry | Position[]) => void;
+ addNewFeatureToIndex: (geometries: Array) => void;
deleteFeatureFromIndex: (featureId: string) => void;
- disableDrawState: () => void;
}
export interface OwnProps {
@@ -43,6 +42,7 @@ type Props = ReduxStateProps & ReduxDispatchProps & OwnProps;
export class DrawFeatureControl extends Component {
_onDraw = async (e: { features: Feature[] }, mbDrawControl: MapboxDraw) => {
try {
+ const geometries: Array = [];
e.features.forEach((feature: Feature) => {
const { geometry } = geoJSONReader.read(feature);
if (!geometry.isSimple() || !geometry.isValid()) {
@@ -58,9 +58,13 @@ export class DrawFeatureControl extends Component {
this.props.drawMode === DRAW_MODE.DRAW_POINTS
? feature.geometry.coordinates
: feature.geometry;
- this.props.addNewFeatureToIndex(featureGeom);
+ geometries.push(featureGeom);
}
});
+
+ if (geometries.length) {
+ this.props.addNewFeatureToIndex(geometries);
+ }
} catch (error) {
getToasts().addWarning(
i18n.translate('xpack.maps.drawFeatureControl.unableToCreateFeature', {
@@ -71,7 +75,6 @@ export class DrawFeatureControl extends Component {
})
);
} finally {
- this.props.disableDrawState();
try {
mbDrawControl.deleteAll();
} catch (_e) {
@@ -86,6 +89,7 @@ export class DrawFeatureControl extends Component {
if (!this.props.editLayer || this.props.drawShape !== DRAW_SHAPE.DELETE) {
return;
}
+
const mbEditLayerIds = this.props.editLayer
.getMbLayerIds()
.filter((mbLayerId) => !!this.props.mbMap.getLayer(mbLayerId));
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts
index e1d703173fc2da..d2c369b4bd50a2 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts
@@ -15,7 +15,7 @@ import {
ReduxStateProps,
OwnProps,
} from './draw_feature_control';
-import { addNewFeatureToIndex, deleteFeatureFromIndex, updateEditShape } from '../../../../actions';
+import { addNewFeatureToIndex, deleteFeatureFromIndex } from '../../../../actions';
import { MapStoreState } from '../../../../reducers/store';
import { getEditState, getLayerById } from '../../../../selectors/map_selectors';
import { getDrawMode } from '../../../../selectors/ui_selectors';
@@ -34,15 +34,12 @@ function mapDispatchToProps(
dispatch: ThunkDispatch
): ReduxDispatchProps {
return {
- addNewFeatureToIndex(geometry: Geometry | Position[]) {
- dispatch(addNewFeatureToIndex(geometry));
+ addNewFeatureToIndex(geometries: Array) {
+ dispatch(addNewFeatureToIndex(geometries));
},
deleteFeatureFromIndex(featureId: string) {
dispatch(deleteFeatureFromIndex(featureId));
},
- disableDrawState() {
- dispatch(updateEditShape(null));
- },
};
}
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx
index 2f652506857d2a..98d88d43fc65f9 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx
@@ -20,7 +20,7 @@ import {
roundCoordinates,
} from '../../../../../common/elasticsearch_util';
import { getToasts } from '../../../../kibana_services';
-import { DrawControl } from '../';
+import { DrawControl } from '../draw_control';
import { DrawCircleProperties } from '../draw_circle';
export interface Props {
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/index.ts b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/index.ts
deleted file mode 100644
index b0f1941caec08c..00000000000000
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ThunkDispatch } from 'redux-thunk';
-import { AnyAction } from 'redux';
-import { connect } from 'react-redux';
-import { updateEditShape } from '../../../actions';
-import { MapStoreState } from '../../../reducers/store';
-import { DrawControl } from './draw_control';
-import { DRAW_SHAPE } from '../../../../common/constants';
-
-function mapDispatchToProps(dispatch: ThunkDispatch) {
- return {
- updateEditShape(shapeToDraw: DRAW_SHAPE) {
- dispatch(updateEditShape(shapeToDraw));
- },
- };
-}
-
-const connected = connect(null, mapDispatchToProps)(DrawControl);
-export { connected as DrawControl };
diff --git a/x-pack/plugins/maps/public/reducers/ui.ts b/x-pack/plugins/maps/public/reducers/ui.ts
index f3f948bb96508a..f0f22c5a8c4a93 100644
--- a/x-pack/plugins/maps/public/reducers/ui.ts
+++ b/x-pack/plugins/maps/public/reducers/ui.ts
@@ -19,6 +19,8 @@ import {
SHOW_TOC_DETAILS,
HIDE_TOC_DETAILS,
SET_DRAW_MODE,
+ PUSH_DELETED_FEATURE_ID,
+ CLEAR_DELETED_FEATURE_IDS,
} from '../actions';
import { DRAW_MODE } from '../../common/constants';
@@ -37,6 +39,7 @@ export type MapUiState = {
isLayerTOCOpen: boolean;
isTimesliderOpen: boolean;
openTOCDetails: string[];
+ deletedFeatureIds: string[];
};
export const DEFAULT_IS_LAYER_TOC_OPEN = true;
@@ -51,6 +54,7 @@ export const DEFAULT_MAP_UI_STATE = {
// storing TOC detail visibility outside of map.layerList because its UI state and not map rendering state.
// This also makes for easy read/write access for embeddables.
openTOCDetails: [],
+ deletedFeatureIds: [],
};
// Reducer
@@ -82,6 +86,16 @@ export function ui(state: MapUiState = DEFAULT_MAP_UI_STATE, action: any) {
return layerId !== action.layerId;
}),
};
+ case PUSH_DELETED_FEATURE_ID:
+ return {
+ ...state,
+ deletedFeatureIds: [...state.deletedFeatureIds, action.featureId],
+ };
+ case CLEAR_DELETED_FEATURE_IDS:
+ return {
+ ...state,
+ deletedFeatureIds: [],
+ };
default:
return state;
}
diff --git a/x-pack/plugins/maps/public/selectors/ui_selectors.ts b/x-pack/plugins/maps/public/selectors/ui_selectors.ts
index 942a5190691a15..6bdf5a35679a73 100644
--- a/x-pack/plugins/maps/public/selectors/ui_selectors.ts
+++ b/x-pack/plugins/maps/public/selectors/ui_selectors.ts
@@ -17,3 +17,4 @@ export const getIsTimesliderOpen = ({ ui }: MapStoreState): boolean => ui.isTime
export const getOpenTOCDetails = ({ ui }: MapStoreState): string[] => ui.openTOCDetails;
export const getIsFullScreen = ({ ui }: MapStoreState): boolean => ui.isFullScreen;
export const getIsReadOnly = ({ ui }: MapStoreState): boolean => ui.isReadOnly;
+export const getDeletedFeatureIds = ({ ui }: MapStoreState): string[] => ui.deletedFeatureIds;
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index 3df5016f560c07..4a621bc5f608b5 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -124,6 +124,17 @@ export class DataRecognizer {
private _resultsService: ReturnType;
private _calculateModelMemoryLimit: ReturnType;
+ /**
+ * A temporary cache of configs loaded from disk and from save object service.
+ * The configs from disk will not change while kibana is running.
+ * The configs from saved objects could potentially change while an instance of
+ * DataRecognizer exists, if a fleet package containing modules is installed.
+ * However the chance of this happening is very low and so the benefit of using
+ * this cache outweighs the risk of the cache being out of date during the short
+ * existence of a DataRecognizer instance.
+ */
+ private _configCache: Config[] | null = null;
+
/**
* List of the module jobs that require model memory estimation
*/
@@ -181,6 +192,10 @@ export class DataRecognizer {
}
private async _loadConfigs(): Promise {
+ if (this._configCache !== null) {
+ return this._configCache;
+ }
+
const configs: Config[] = [];
const dirs = await this._listDirs(this._modulesDir);
await Promise.all(
@@ -211,7 +226,9 @@ export class DataRecognizer {
isSavedObject: true,
}));
- return [...configs, ...savedObjectConfigs];
+ this._configCache = [...configs, ...savedObjectConfigs];
+
+ return this._configCache;
}
private async _loadSavedObjectModules() {
diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
index 2ab10bda361909..1fa7217e7d252d 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -609,12 +609,12 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
/**
* @apiGroup DataFrameAnalytics
*
- * @api {post} /api/ml/data_frame/analytics/job_exists Check whether jobs exists in current or any space
- * @apiName JobExists
- * @apiDescription Checks if each of the jobs in the specified list of IDs exist.
+ * @api {post} /api/ml/data_frame/analytics/jobs_exist Check whether jobs exist in current or any space
+ * @apiName JobsExist
+ * @apiDescription Checks if each of the jobs in the specified list of IDs exists.
* If allSpaces is true, the check will look across all spaces.
*
- * @apiSchema (params) analyticsIdSchema
+ * @apiSchema (params) jobsExistSchema
*/
router.post(
{
@@ -707,7 +707,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
/**
* @apiGroup DataFrameAnalytics
*
- * @api {get} api/data_frame/analytics/fields/:indexPattern Get fields for a pattern of indices used for analytics
+ * @api {get} /api/ml/data_frame/analytics/new_job_caps/:indexPattern Get fields for a pattern of indices used for analytics
* @apiName AnalyticsNewJobCaps
* @apiDescription Retrieve the index fields for analytics
*/
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/enterprise_search_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/enterprise_search_panel.js
index 1459ccb2ecac63..b8ff05213c1c03 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/enterprise_search_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/enterprise_search_panel.js
@@ -31,6 +31,12 @@ import { getSafeForExternalLink } from '../../../lib/get_safe_for_external_link'
export function EnterpriseSearchPanel(props) {
const { setupMode } = props;
const setupModeData = get(setupMode.data, 'enterprise_search');
+ const nodesCount = props.stats.totalInstances || 0;
+
+ // Do not show if we are not in setup mode
+ if (!nodesCount && !setupMode.enabled) {
+ return null;
+ }
return (
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
index 7096647854c157..76cc9adeb43ecd 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
@@ -90,7 +90,6 @@ export function getSettingsCollector(
) {
return usageCollection.makeStatsCollector<
EmailSettingData | undefined,
- false,
KibanaSettingsCollectorExtraOptions
>({
type: 'kibana_settings',
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
index cbbfe64f5e3e22..0c952949c56b49 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
@@ -18,7 +18,7 @@ export function getMonitoringUsageCollector(
config: MonitoringConfig,
getClient: () => IClusterClient
) {
- return usageCollection.makeUsageCollector({
+ return usageCollection.makeUsageCollector({
type: 'monitoring',
isReady: () => true,
schema: {
@@ -95,13 +95,8 @@ export function getMonitoringUsageCollector(
},
},
},
- extendFetchContext: {
- kibanaRequest: true,
- },
- fetch: async ({ kibanaRequest }) => {
- const callCluster = kibanaRequest
- ? getClient().asScoped(kibanaRequest).asCurrentUser
- : getClient().asInternalUser;
+ fetch: async () => {
+ const callCluster = getClient().asInternalUser;
const usageClusters: MonitoringClusterStackProductUsage[] = [];
const availableCcs = config.ui.ccs.enabled;
const clusters = await fetchClusters(callCluster);
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
index bce6f57d6f950a..344b04fb4780d4 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
@@ -34,13 +34,9 @@ export function registerMonitoringTelemetryCollection(
getClient: () => IClusterClient,
maxBucketSize: number
) {
- const monitoringStatsCollector = usageCollection.makeStatsCollector<
- MonitoringTelemetryUsage,
- true
- >({
+ const monitoringStatsCollector = usageCollection.makeStatsCollector({
type: 'monitoringTelemetry',
isReady: () => true,
- extendFetchContext: { kibanaRequest: true },
schema: {
stats: {
type: 'array',
@@ -137,13 +133,13 @@ export function registerMonitoringTelemetryCollection(
},
},
},
- fetch: async ({ kibanaRequest, esClient }) => {
+ fetch: async () => {
const timestamp = Date.now(); // Collect the telemetry from the monitoring indices for this moment.
// NOTE: Usually, the monitoring indices index stats for each product every 10s (by default).
// However, some data may be delayed up-to 24h because monitoring only collects extended Kibana stats in that interval
// to avoid overloading of the system when retrieving data from the collectors (that delay is dealt with in the Kibana Stats getter inside the `getAllStats` method).
// By 8.x, we expect to stop collecting the Kibana extended stats and keep only the monitoring-related metrics.
- const callCluster = kibanaRequest ? esClient : getClient().asInternalUser;
+ const callCluster = getClient().asInternalUser;
const clusterDetails = await getClusterUuids(callCluster, timestamp, maxBucketSize);
const [licenses, stats] = await Promise.all([
getLicenses(clusterDetails, callCluster, maxBucketSize),
diff --git a/x-pack/plugins/reporting/server/config/config.ts b/x-pack/plugins/reporting/server/config/config.ts
index 00c57053653f75..269a66503a741f 100644
--- a/x-pack/plugins/reporting/server/config/config.ts
+++ b/x-pack/plugins/reporting/server/config/config.ts
@@ -7,8 +7,7 @@
import { get } from 'lodash';
import { first } from 'rxjs/operators';
-import { CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { LevelLogger } from '../lib';
+import type { CoreSetup, Logger, PluginInitializerContext } from 'kibana/server';
import { createConfig$ } from './create_config';
import { ReportingConfigType } from './schema';
@@ -63,13 +62,13 @@ export interface ReportingConfig extends Config {
* @internal
* @param {PluginInitializerContext} initContext
* @param {CoreSetup} core
- * @param {LevelLogger} logger
+ * @param {Logger} logger
* @returns {Promise}
*/
export const buildConfig = async (
initContext: PluginInitializerContext,
core: CoreSetup,
- logger: LevelLogger
+ logger: Logger
): Promise => {
const config$ = initContext.config.create();
const { http } = core;
diff --git a/x-pack/plugins/reporting/server/config/create_config.test.ts b/x-pack/plugins/reporting/server/config/create_config.test.ts
index fd8180bd46a05d..f839d72e1a45df 100644
--- a/x-pack/plugins/reporting/server/config/create_config.test.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.test.ts
@@ -6,11 +6,10 @@
*/
import * as Rx from 'rxjs';
-import { CoreSetup, HttpServerInfo, PluginInitializerContext } from 'src/core/server';
-import { coreMock } from 'src/core/server/mocks';
-import { LevelLogger } from '../lib/level_logger';
-import { createMockConfigSchema, createMockLevelLogger } from '../test_helpers';
-import { ReportingConfigType } from './';
+import type { CoreSetup, HttpServerInfo, Logger, PluginInitializerContext } from 'kibana/server';
+import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
+import { createMockConfigSchema } from '../test_helpers';
+import type { ReportingConfigType } from './';
import { createConfig$ } from './create_config';
const createMockConfig = (
@@ -20,14 +19,14 @@ const createMockConfig = (
describe('Reporting server createConfig$', () => {
let mockCoreSetup: CoreSetup;
let mockInitContext: PluginInitializerContext;
- let mockLogger: jest.Mocked;
+ let mockLogger: jest.Mocked;
beforeEach(() => {
mockCoreSetup = coreMock.createSetup();
mockInitContext = coreMock.createPluginInitializerContext(
createMockConfigSchema({ kibanaServer: {} })
);
- mockLogger = createMockLevelLogger();
+ mockLogger = loggingSystemMock.createLogger();
});
afterEach(() => {
diff --git a/x-pack/plugins/reporting/server/config/create_config.ts b/x-pack/plugins/reporting/server/config/create_config.ts
index 2ac225ec4576a8..ff8d00c30d4f83 100644
--- a/x-pack/plugins/reporting/server/config/create_config.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.ts
@@ -7,11 +7,10 @@
import crypto from 'crypto';
import ipaddr from 'ipaddr.js';
+import type { CoreSetup, Logger } from 'kibana/server';
import { sum } from 'lodash';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
-import { CoreSetup } from 'src/core/server';
-import { LevelLogger } from '../lib';
import { ReportingConfigType } from './schema';
/*
@@ -22,9 +21,9 @@ import { ReportingConfigType } from './schema';
export function createConfig$(
core: CoreSetup,
config$: Observable,
- parentLogger: LevelLogger
+ parentLogger: Logger
) {
- const logger = parentLogger.clone(['config']);
+ const logger = parentLogger.get('config');
return config$.pipe(
map((config) => {
// encryption key
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
index 745542c358a69b..a4e4f43f90e1ee 100644
--- a/x-pack/plugins/reporting/server/core.ts
+++ b/x-pack/plugins/reporting/server/core.ts
@@ -11,6 +11,7 @@ import { filter, first, map, switchMap, take } from 'rxjs/operators';
import type {
BasePath,
IClusterClient,
+ Logger,
PackageInfo,
PluginInitializerContext,
SavedObjectsClientContract,
@@ -32,7 +33,7 @@ import { REPORTING_REDIRECT_LOCATOR_STORE_KEY } from '../common/constants';
import { durationToNumber } from '../common/schema_utils';
import type { ReportingConfig, ReportingSetup } from './';
import { ReportingConfigType } from './config';
-import { checkLicense, getExportTypesRegistry, LevelLogger } from './lib';
+import { checkLicense, getExportTypesRegistry } from './lib';
import { reportingEventLoggerFactory } from './lib/event_logger/logger';
import type { IReport, ReportingStore } from './lib/store';
import { ExecuteReportTask, MonitorReportsTask, ReportTaskParams } from './lib/tasks';
@@ -45,7 +46,7 @@ export interface ReportingInternalSetup {
security?: SecurityPluginSetup;
spaces?: SpacesPluginSetup;
taskManager: TaskManagerSetupContract;
- logger: LevelLogger;
+ logger: Logger;
status: StatusServiceSetup;
}
@@ -57,7 +58,7 @@ export interface ReportingInternalStart {
data: DataPluginStart;
fieldFormats: FieldFormatsStart;
licensing: LicensingPluginStart;
- logger: LevelLogger;
+ logger: Logger;
screenshotting: ScreenshottingStart;
security?: SecurityPluginStart;
taskManager: TaskManagerStartContract;
@@ -81,7 +82,7 @@ export class ReportingCore {
public getContract: () => ReportingSetup;
- constructor(private logger: LevelLogger, context: PluginInitializerContext) {
+ constructor(private logger: Logger, context: PluginInitializerContext) {
this.packageInfo = context.env.packageInfo;
const syncConfig = context.config.get();
this.deprecatedAllowedRoles = syncConfig.roles.enabled ? syncConfig.roles.allow : false;
diff --git a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
index b5258d91485f70..56a1c39e75aa46 100644
--- a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
@@ -5,11 +5,11 @@
* 2.0.
*/
+import { loggingSystemMock } from 'src/core/server/mocks';
import { cryptoFactory } from '../../lib';
-import { createMockLevelLogger } from '../../test_helpers';
import { decryptJobHeaders } from './';
-const logger = createMockLevelLogger();
+const logger = loggingSystemMock.createLogger();
const encryptHeaders = async (encryptionKey: string, headers: Record) => {
const crypto = cryptoFactory(encryptionKey);
diff --git a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
index f126d1edbfce3a..3dfcfe362abd49 100644
--- a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
@@ -6,12 +6,13 @@
*/
import { i18n } from '@kbn/i18n';
-import { cryptoFactory, LevelLogger } from '../../lib';
+import type { Logger } from 'kibana/server';
+import { cryptoFactory } from '../../lib';
export const decryptJobHeaders = async (
encryptionKey: string | undefined,
headers: string,
- logger: LevelLogger
+ logger: Logger
): Promise> => {
try {
if (typeof headers !== 'string') {
diff --git a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
index caa0b7fb91b3f2..272d1c287178ad 100644
--- a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
@@ -6,14 +6,14 @@
*/
import apm from 'elastic-apm-node';
+import type { Logger } from 'kibana/server';
import * as Rx from 'rxjs';
import { finalize, map, tap } from 'rxjs/operators';
+import type { ReportingCore } from '../../';
import { LayoutTypes } from '../../../../screenshotting/common';
import { REPORTING_TRANSACTION_TYPE } from '../../../common/constants';
import type { PngMetrics } from '../../../common/types';
-import { ReportingCore } from '../../';
-import { ScreenshotOptions } from '../../types';
-import { LevelLogger } from '../../lib';
+import type { ScreenshotOptions } from '../../types';
interface PngResult {
buffer: Buffer;
@@ -23,7 +23,7 @@ interface PngResult {
export function generatePngObservable(
reporting: ReportingCore,
- logger: LevelLogger,
+ logger: Logger,
options: ScreenshotOptions
): Rx.Observable {
const apmTrans = apm.startTransaction('generate-png', REPORTING_TRANSACTION_TYPE);
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
index f5675b50cfddd4..850d0ae507e126 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
@@ -5,17 +5,14 @@
* 2.0.
*/
-import { ReportingCore } from '../..';
-import {
- createMockConfigSchema,
- createMockLevelLogger,
- createMockReportingCore,
-} from '../../test_helpers';
+import { loggingSystemMock } from 'src/core/server/mocks';
+import { ReportingCore } from '../../';
+import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
import { getCustomLogo } from './get_custom_logo';
let mockReportingPlugin: ReportingCore;
-const logger = createMockLevelLogger();
+const logger = loggingSystemMock.createLogger();
beforeEach(async () => {
mockReportingPlugin = await createMockReportingCore(createMockConfigSchema());
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
index fcabd34a642c8c..10873155039885 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
@@ -5,16 +5,15 @@
* 2.0.
*/
-import type { Headers } from 'src/core/server';
+import type { Headers, Logger } from 'kibana/server';
import { ReportingCore } from '../../';
import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
-import { LevelLogger } from '../../lib';
export const getCustomLogo = async (
reporting: ReportingCore,
headers: Headers,
spaceId: string | undefined,
- logger: LevelLogger
+ logger: Logger
) => {
const fakeRequest = reporting.getFakeRequest({ headers }, spaceId, logger);
const uiSettingsClient = await reporting.getUiSettingsClient(fakeRequest, logger);
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
index ee6d6daab88e06..5a8c4f1fd760c0 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
@@ -16,18 +16,15 @@ jest.mock('./generate_csv/generate_csv', () => ({
},
}));
-import { Writable } from 'stream';
import nodeCrypto from '@elastic/node-crypto';
+import { loggingSystemMock } from 'src/core/server/mocks';
+import { Writable } from 'stream';
import { ReportingCore } from '../../';
import { CancellationToken } from '../../../common/cancellation_token';
-import {
- createMockConfigSchema,
- createMockLevelLogger,
- createMockReportingCore,
-} from '../../test_helpers';
+import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
import { runTaskFnFactory } from './execute_job';
-const logger = createMockLevelLogger();
+const logger = loggingSystemMock.createLogger();
const encryptionKey = 'tetkey';
const headers = { sid: 'cooltestheaders' };
let encryptedHeaders: string;
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.ts
index 97f0aa65e3d68e..8b5f0e5395827b 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.ts
@@ -5,7 +5,6 @@
* 2.0.
*/
-import { CSV_JOB_TYPE } from '../../../common/constants';
import { getFieldFormats } from '../../services';
import { RunTaskFn, RunTaskFnFactory } from '../../types';
import { decryptJobHeaders } from '../common';
@@ -19,7 +18,7 @@ export const runTaskFnFactory: RunTaskFnFactory> = (
const config = reporting.getConfig();
return async function runTask(jobId, job, cancellationToken, stream) {
- const logger = parentLogger.clone([CSV_JOB_TYPE, 'execute-job', jobId]);
+ const logger = parentLogger.get(`execute-job:${jobId}`);
const encryptionKey = config.get('encryptionKey');
const headers = await decryptJobHeaders(encryptionKey, job.headers, logger);
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
index c525cb7c0def2d..4755d153666e40 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
@@ -5,21 +5,22 @@
* 2.0.
*/
-import { Writable } from 'stream';
-import * as Rx from 'rxjs';
import { errors as esErrors } from '@elastic/elasticsearch';
+import type { IScopedClusterClient, IUiSettingsClient, SearchResponse } from 'kibana/server';
import { identity, range } from 'lodash';
-import { IScopedClusterClient, IUiSettingsClient, SearchResponse } from 'src/core/server';
+import * as Rx from 'rxjs';
import {
elasticsearchServiceMock,
+ loggingSystemMock,
savedObjectsClientMock,
uiSettingsServiceMock,
} from 'src/core/server/mocks';
import { ISearchStartSearchSource } from 'src/plugins/data/common';
-import { FieldFormatsRegistry } from 'src/plugins/field_formats/common';
import { searchSourceInstanceMock } from 'src/plugins/data/common/search/search_source/mocks';
import { IScopedSearchClient } from 'src/plugins/data/server';
import { dataPluginMock } from 'src/plugins/data/server/mocks';
+import { FieldFormatsRegistry } from 'src/plugins/field_formats/common';
+import { Writable } from 'stream';
import { ReportingConfig } from '../../../';
import { CancellationToken } from '../../../../common/cancellation_token';
import {
@@ -28,11 +29,7 @@ import {
UI_SETTINGS_DATEFORMAT_TZ,
} from '../../../../common/constants';
import { UnknownError } from '../../../../common/errors';
-import {
- createMockConfig,
- createMockConfigSchema,
- createMockLevelLogger,
-} from '../../../test_helpers';
+import { createMockConfig, createMockConfigSchema } from '../../../test_helpers';
import { JobParamsCSV } from '../types';
import { CsvGenerator } from './generate_csv';
@@ -125,7 +122,7 @@ beforeEach(async () => {
});
});
-const logger = createMockLevelLogger();
+const logger = loggingSystemMock.createLogger();
it('formats an empty search result to CSV content', async () => {
const generateCsv = new CsvGenerator(
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
index 201484af9d7d0a..c913706f585624 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
@@ -5,9 +5,9 @@
* 2.0.
*/
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { errors as esErrors } from '@elastic/elasticsearch';
-import type { IScopedClusterClient, IUiSettingsClient } from 'src/core/server';
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { IScopedClusterClient, IUiSettingsClient, Logger } from 'kibana/server';
import type { IScopedSearchClient } from 'src/plugins/data/server';
import type { Datatable } from 'src/plugins/expressions/server';
import type { Writable } from 'stream';
@@ -32,16 +32,15 @@ import type { CancellationToken } from '../../../../common/cancellation_token';
import { CONTENT_TYPE_CSV } from '../../../../common/constants';
import {
AuthenticationExpiredError,
- UnknownError,
ReportingError,
+ UnknownError,
} from '../../../../common/errors';
import { byteSizeValueToNumber } from '../../../../common/schema_utils';
-import type { LevelLogger } from '../../../lib';
import type { TaskRunResult } from '../../../lib/tasks';
import type { JobParamsCSV } from '../types';
import { CsvExportSettings, getExportSettings } from './get_export_settings';
-import { MaxSizeStringBuilder } from './max_size_string_builder';
import { i18nTexts } from './i18n_texts';
+import { MaxSizeStringBuilder } from './max_size_string_builder';
interface Clients {
es: IScopedClusterClient;
@@ -65,7 +64,7 @@ export class CsvGenerator {
private clients: Clients,
private dependencies: Dependencies,
private cancellationToken: CancellationToken,
- private logger: LevelLogger,
+ private logger: Logger,
private stream: Writable
) {}
@@ -316,7 +315,7 @@ export class CsvGenerator {
}
if (!results) {
- this.logger.warning(`Search results are undefined!`);
+ this.logger.warn(`Search results are undefined!`);
break;
}
@@ -396,7 +395,7 @@ export class CsvGenerator {
this.logger.debug(`Finished generating. Row count: ${this.csvRowCount}.`);
if (!this.maxSizeReached && this.csvRowCount !== totalRecords) {
- this.logger.warning(
+ this.logger.warn(
`ES scroll returned fewer total hits than expected! ` +
`Search result total hits: ${totalRecords}. Row count: ${this.csvRowCount}.`
);
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
index 2ae3e5e712d313..ef0f0062bf19b6 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
@@ -12,18 +12,18 @@ import {
UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
} from '../../../../common/constants';
import { IUiSettingsClient } from 'kibana/server';
-import { savedObjectsClientMock, uiSettingsServiceMock } from 'src/core/server/mocks';
import {
- createMockConfig,
- createMockConfigSchema,
- createMockLevelLogger,
-} from '../../../test_helpers';
+ loggingSystemMock,
+ savedObjectsClientMock,
+ uiSettingsServiceMock,
+} from 'src/core/server/mocks';
+import { createMockConfig, createMockConfigSchema } from '../../../test_helpers';
import { getExportSettings } from './get_export_settings';
describe('getExportSettings', () => {
let uiSettingsClient: IUiSettingsClient;
const config = createMockConfig(createMockConfigSchema({}));
- const logger = createMockLevelLogger();
+ const logger = loggingSystemMock.createLogger();
beforeEach(() => {
uiSettingsClient = uiSettingsServiceMock
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
index 5b69e33624c5c2..6a07e3184eb48f 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
@@ -6,7 +6,7 @@
*/
import { ByteSizeValue } from '@kbn/config-schema';
-import { IUiSettingsClient } from 'kibana/server';
+import type { IUiSettingsClient, Logger } from 'kibana/server';
import { createEscapeValue } from '../../../../../../../src/plugins/data/common';
import { ReportingConfig } from '../../../';
import {
@@ -16,7 +16,6 @@ import {
UI_SETTINGS_DATEFORMAT_TZ,
UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
} from '../../../../common/constants';
-import { LevelLogger } from '../../../lib';
export interface CsvExportSettings {
timezone: string;
@@ -37,7 +36,7 @@ export const getExportSettings = async (
client: IUiSettingsClient,
config: ReportingConfig,
timezone: string | undefined,
- logger: LevelLogger
+ logger: Logger
): Promise => {
let setTimezone: string;
if (timezone) {
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
index 53e1f6ba3c95bf..50ae2ab10f6e75 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
@@ -8,7 +8,6 @@
import { KibanaRequest } from 'src/core/server';
import { Writable } from 'stream';
import { CancellationToken } from '../../../common/cancellation_token';
-import { CSV_SEARCHSOURCE_IMMEDIATE_TYPE } from '../../../common/constants';
import { TaskRunResult } from '../../lib/tasks';
import { getFieldFormats } from '../../services';
import { ReportingRequestHandlerContext, RunTaskFnFactory } from '../../types';
@@ -32,7 +31,7 @@ export const runTaskFnFactory: RunTaskFnFactory = function e
parentLogger
) {
const config = reporting.getConfig();
- const logger = parentLogger.clone([CSV_SEARCHSOURCE_IMMEDIATE_TYPE, 'execute-job']);
+ const logger = parentLogger.get('execute-job');
return async function runTask(_jobId, immediateJobParams, context, stream, req) {
const job = {
@@ -82,7 +81,7 @@ export const runTaskFnFactory: RunTaskFnFactory = function e
const { warnings } = result;
if (warnings) {
warnings.forEach((warning) => {
- logger.warning(warning);
+ logger.warn(warning);
});
}
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
index 9069ec63a88250..bc37978372ba63 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
@@ -5,11 +5,12 @@
* 2.0.
*/
-import { Writable } from 'stream';
import * as Rx from 'rxjs';
+import { loggingSystemMock } from 'src/core/server/mocks';
+import { Writable } from 'stream';
import { ReportingCore } from '../../../';
import { CancellationToken } from '../../../../common/cancellation_token';
-import { cryptoFactory, LevelLogger } from '../../../lib';
+import { cryptoFactory } from '../../../lib';
import {
createMockConfig,
createMockConfigSchema,
@@ -29,14 +30,7 @@ const cancellationToken = {
on: jest.fn(),
} as unknown as CancellationToken;
-const mockLoggerFactory = {
- get: jest.fn().mockImplementation(() => ({
- error: jest.fn(),
- debug: jest.fn(),
- warn: jest.fn(),
- })),
-};
-const getMockLogger = () => new LevelLogger(mockLoggerFactory);
+const getMockLogger = () => loggingSystemMock.createLogger();
const mockEncryptionKey = 'abcabcsecuresecret';
const encryptHeaders = async (headers: Record) => {
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
index 67d013740bedd3..52023e53b80b56 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
@@ -8,7 +8,7 @@
import apm from 'elastic-apm-node';
import * as Rx from 'rxjs';
import { finalize, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
-import { PNG_JOB_TYPE, REPORTING_TRANSACTION_TYPE } from '../../../../common/constants';
+import { REPORTING_TRANSACTION_TYPE } from '../../../../common/constants';
import { TaskRunResult } from '../../../lib/tasks';
import { RunTaskFn, RunTaskFnFactory } from '../../../types';
import { decryptJobHeaders, getFullUrls, generatePngObservable } from '../../common';
@@ -24,7 +24,7 @@ export const runTaskFnFactory: RunTaskFnFactory> =
const apmGetAssets = apmTrans?.startSpan('get-assets', 'setup');
let apmGeneratePng: { end: () => void } | null | undefined;
- const jobLogger = parentLogger.clone([PNG_JOB_TYPE, 'execute', jobId]);
+ const jobLogger = parentLogger.get(`execute:${jobId}`);
const process$: Rx.Observable = Rx.of(1).pipe(
mergeMap(() => decryptJobHeaders(encryptionKey, job.headers, jobLogger)),
mergeMap((headers) => {
diff --git a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
index 1b1ad6878d78fb..1403873e8da4b8 100644
--- a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
@@ -6,11 +6,12 @@
*/
import * as Rx from 'rxjs';
+import { loggingSystemMock } from 'src/core/server/mocks';
import { Writable } from 'stream';
import { ReportingCore } from '../../';
import { CancellationToken } from '../../../common/cancellation_token';
import { LocatorParams } from '../../../common/types';
-import { cryptoFactory, LevelLogger } from '../../lib';
+import { cryptoFactory } from '../../lib';
import {
createMockConfig,
createMockConfigSchema,
@@ -30,14 +31,7 @@ const cancellationToken = {
on: jest.fn(),
} as unknown as CancellationToken;
-const mockLoggerFactory = {
- get: jest.fn().mockImplementation(() => ({
- error: jest.fn(),
- debug: jest.fn(),
- warn: jest.fn(),
- })),
-};
-const getMockLogger = () => new LevelLogger(mockLoggerFactory);
+const getMockLogger = () => loggingSystemMock.createLogger();
const mockEncryptionKey = 'abcabcsecuresecret';
const encryptHeaders = async (headers: Record) => {
diff --git a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
index 51044aa324a1aa..5df7a497adf6c7 100644
--- a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
@@ -8,7 +8,7 @@
import apm from 'elastic-apm-node';
import * as Rx from 'rxjs';
import { finalize, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
-import { PNG_JOB_TYPE_V2, REPORTING_TRANSACTION_TYPE } from '../../../common/constants';
+import { REPORTING_TRANSACTION_TYPE } from '../../../common/constants';
import { TaskRunResult } from '../../lib/tasks';
import { RunTaskFn, RunTaskFnFactory } from '../../types';
import { decryptJobHeaders, generatePngObservable } from '../common';
@@ -25,7 +25,7 @@ export const runTaskFnFactory: RunTaskFnFactory> =
const apmGetAssets = apmTrans?.startSpan('get-assets', 'setup');
let apmGeneratePng: { end: () => void } | null | undefined;
- const jobLogger = parentLogger.clone([PNG_JOB_TYPE_V2, 'execute', jobId]);
+ const jobLogger = parentLogger.get(`execute:${jobId}`);
const process$: Rx.Observable = Rx.of(1).pipe(
mergeMap(() => decryptJobHeaders(encryptionKey, job.headers, jobLogger)),
mergeMap((headers) => {
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
index a8d2027f2ba120..7faa13486b5a18 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
@@ -6,10 +6,11 @@
*/
import * as Rx from 'rxjs';
+import { loggingSystemMock } from 'src/core/server/mocks';
import { Writable } from 'stream';
import { ReportingCore } from '../../../';
import { CancellationToken } from '../../../../common/cancellation_token';
-import { cryptoFactory, LevelLogger } from '../../../lib';
+import { cryptoFactory } from '../../../lib';
import { createMockConfigSchema, createMockReportingCore } from '../../../test_helpers';
import { generatePdfObservable } from '../lib/generate_pdf';
import { TaskPayloadPDF } from '../types';
@@ -25,14 +26,7 @@ const cancellationToken = {
on: jest.fn(),
} as unknown as CancellationToken;
-const mockLoggerFactory = {
- get: jest.fn().mockImplementation(() => ({
- error: jest.fn(),
- debug: jest.fn(),
- warn: jest.fn(),
- })),
-};
-const getMockLogger = () => new LevelLogger(mockLoggerFactory);
+const getMockLogger = () => loggingSystemMock.createLogger();
const mockEncryptionKey = 'testencryptionkey';
const encryptHeaders = async (headers: Record) => {
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
index ab3793935e1d86..9b4db48ed66970 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
@@ -8,7 +8,7 @@
import apm from 'elastic-apm-node';
import * as Rx from 'rxjs';
import { catchError, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
-import { PDF_JOB_TYPE, REPORTING_TRANSACTION_TYPE } from '../../../../common/constants';
+import { REPORTING_TRANSACTION_TYPE } from '../../../../common/constants';
import { TaskRunResult } from '../../../lib/tasks';
import { RunTaskFn, RunTaskFnFactory } from '../../../types';
import { decryptJobHeaders, getFullUrls, getCustomLogo } from '../../common';
@@ -21,7 +21,7 @@ export const runTaskFnFactory: RunTaskFnFactory> =
const encryptionKey = config.get('encryptionKey');
return async function runTask(jobId, job, cancellationToken, stream) {
- const jobLogger = parentLogger.clone([PDF_JOB_TYPE, 'execute-job', jobId]);
+ const jobLogger = parentLogger.get(`execute-job:${jobId}`);
const apmTrans = apm.startTransaction('execute-job-pdf', REPORTING_TRANSACTION_TYPE);
const apmGetAssets = apmTrans?.startSpan('get-assets', 'setup');
let apmGeneratePdf: { end: () => void } | null | undefined;
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
index a401f59b8f4bf0..ff0ef2cf39af4b 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
@@ -5,13 +5,13 @@
* 2.0.
*/
+import type { Logger } from 'kibana/server';
import { groupBy } from 'lodash';
import * as Rx from 'rxjs';
import { mergeMap, tap } from 'rxjs/operators';
+import { ReportingCore } from '../../../';
import { ScreenshotResult } from '../../../../../screenshotting/server';
import type { PdfMetrics } from '../../../../common/types';
-import { ReportingCore } from '../../../';
-import { LevelLogger } from '../../../lib';
import { ScreenshotOptions } from '../../../types';
import { PdfMaker } from '../../common/pdf';
import { getTracker } from './tracker';
@@ -34,7 +34,7 @@ interface PdfResult {
export function generatePdfObservable(
reporting: ReportingCore,
- logger: LevelLogger,
+ logger: Logger,
title: string,
options: ScreenshotOptions,
logo?: string
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
index 3cf7f82058563a..efad71a64a81d6 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
@@ -8,11 +8,12 @@
jest.mock('./lib/generate_pdf');
import * as Rx from 'rxjs';
+import { loggingSystemMock } from 'src/core/server/mocks';
import { Writable } from 'stream';
import { ReportingCore } from '../../';
import { CancellationToken } from '../../../common/cancellation_token';
import { LocatorParams } from '../../../common/types';
-import { cryptoFactory, LevelLogger } from '../../lib';
+import { cryptoFactory } from '../../lib';
import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
import { runTaskFnFactory } from './execute_job';
import { generatePdfObservable } from './lib/generate_pdf';
@@ -26,14 +27,7 @@ const cancellationToken = {
on: jest.fn(),
} as unknown as CancellationToken;
-const mockLoggerFactory = {
- get: jest.fn().mockImplementation(() => ({
- error: jest.fn(),
- debug: jest.fn(),
- warn: jest.fn(),
- })),
-};
-const getMockLogger = () => new LevelLogger(mockLoggerFactory);
+const getMockLogger = () => loggingSystemMock.createLogger();
const mockEncryptionKey = 'testencryptionkey';
const encryptHeaders = async (headers: Record) => {
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
index 85684bca66b869..7f887707829cb1 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
@@ -8,7 +8,7 @@
import apm from 'elastic-apm-node';
import * as Rx from 'rxjs';
import { catchError, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
-import { PDF_JOB_TYPE_V2, REPORTING_TRANSACTION_TYPE } from '../../../common/constants';
+import { REPORTING_TRANSACTION_TYPE } from '../../../common/constants';
import { TaskRunResult } from '../../lib/tasks';
import { RunTaskFn, RunTaskFnFactory } from '../../types';
import { decryptJobHeaders, getCustomLogo } from '../common';
@@ -21,7 +21,7 @@ export const runTaskFnFactory: RunTaskFnFactory> =
const encryptionKey = config.get('encryptionKey');
return async function runTask(jobId, job, cancellationToken, stream) {
- const jobLogger = parentLogger.clone([PDF_JOB_TYPE_V2, 'execute-job', jobId]);
+ const jobLogger = parentLogger.get(`execute-job:${jobId}`);
const apmTrans = apm.startTransaction('execute-job-pdf-v2', REPORTING_TRANSACTION_TYPE);
const apmGetAssets = apmTrans?.startSpan('get-assets', 'setup');
let apmGeneratePdf: { end: () => void } | null | undefined;
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
index ac922c07574b3c..8bec3cac28f430 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
@@ -5,14 +5,14 @@
* 2.0.
*/
+import type { Logger } from 'kibana/server';
import { groupBy } from 'lodash';
import * as Rx from 'rxjs';
import { mergeMap, tap } from 'rxjs/operators';
-import { ReportingCore } from '../../../';
-import { ScreenshotResult } from '../../../../../screenshotting/server';
-import { LocatorParams, PdfMetrics, UrlOrUrlLocatorTuple } from '../../../../common/types';
-import { LevelLogger } from '../../../lib';
-import { ScreenshotOptions } from '../../../types';
+import type { ReportingCore } from '../../../';
+import type { ScreenshotResult } from '../../../../../screenshotting/server';
+import type { LocatorParams, PdfMetrics, UrlOrUrlLocatorTuple } from '../../../../common/types';
+import type { ScreenshotOptions } from '../../../types';
import { PdfMaker } from '../../common/pdf';
import { getFullRedirectAppUrl } from '../../common/v2/get_full_redirect_app_url';
import type { TaskPayloadPDFV2 } from '../types';
@@ -36,7 +36,7 @@ interface PdfResult {
export function generatePdfObservable(
reporting: ReportingCore,
- logger: LevelLogger,
+ logger: Logger,
job: TaskPayloadPDFV2,
title: string,
locatorParams: LocatorParams[],
diff --git a/x-pack/plugins/reporting/server/lib/check_params_version.ts b/x-pack/plugins/reporting/server/lib/check_params_version.ts
index 7298384b875715..79237ba56677a5 100644
--- a/x-pack/plugins/reporting/server/lib/check_params_version.ts
+++ b/x-pack/plugins/reporting/server/lib/check_params_version.ts
@@ -5,16 +5,16 @@
* 2.0.
*/
+import type { Logger } from 'kibana/server';
import { UNVERSIONED_VERSION } from '../../common/constants';
import type { BaseParams } from '../../common/types';
-import type { LevelLogger } from './';
-export function checkParamsVersion(jobParams: BaseParams, logger: LevelLogger) {
+export function checkParamsVersion(jobParams: BaseParams, logger: Logger) {
if (jobParams.version) {
logger.debug(`Using reporting job params v${jobParams.version}`);
return jobParams.version;
}
- logger.warning(`No version provided in report job params. Assuming ${UNVERSIONED_VERSION}`);
+ logger.warn(`No version provided in report job params. Assuming ${UNVERSIONED_VERSION}`);
return UNVERSIONED_VERSION;
}
diff --git a/x-pack/plugins/reporting/server/lib/content_stream.test.ts b/x-pack/plugins/reporting/server/lib/content_stream.test.ts
index 0c45ef2d5f5ce8..069ac22258ad10 100644
--- a/x-pack/plugins/reporting/server/lib/content_stream.test.ts
+++ b/x-pack/plugins/reporting/server/lib/content_stream.test.ts
@@ -5,20 +5,20 @@
* 2.0.
*/
+import type { Logger } from 'kibana/server';
import { set } from 'lodash';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
-import { createMockLevelLogger } from '../test_helpers';
+import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
import { ContentStream } from './content_stream';
describe('ContentStream', () => {
let client: ReturnType