@@ -26,14 +25,16 @@ exports[`EnabledFeatures renders as expected 1`] = `
>
,
+ "solutionView":
+
+ ,
}
}
/>
diff --git a/x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.tsx
index 36d0694953242..377f4c51ff0c5 100644
--- a/x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.tsx
+++ b/x-pack/plugins/spaces/public/management/components/enabled_features/enabled_features.tsx
@@ -5,14 +5,12 @@
* 2.0.
*/
-import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
import type { FunctionComponent } from 'react';
import React from 'react';
import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
-import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '@kbn/kibana-react-plugin/public';
import { FeatureTable } from './feature_table';
import type { Space } from '../../../../common';
@@ -25,16 +23,8 @@ interface Props {
}
export const EnabledFeatures: FunctionComponent = (props) => {
- const { services } = useKibana();
- const canManageRoles = services.application?.capabilities.management?.security?.roles === true;
-
return (
-
+
@@ -49,25 +39,16 @@ export const EnabledFeatures: FunctionComponent = (props) => {
+ solutionView: (
+
-
- ) : (
-
+
),
}}
/>
diff --git a/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx b/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx
index c336791991df4..4bf5e437f7350 100644
--- a/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx
+++ b/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx
@@ -7,6 +7,8 @@
import type { EuiSuperSelectOption, EuiThemeComputed } from '@elastic/eui';
import {
+ EuiBetaBadge,
+ EuiCallOut,
EuiFlexGroup,
EuiFlexItem,
EuiFormRow,
@@ -24,6 +26,7 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import type { Space } from '../../../../common';
+import { SOLUTION_VIEW_CLASSIC } from '../../../../common/constants';
import type { SpaceValidator } from '../../lib';
import { SectionPanel } from '../section_panel';
@@ -40,9 +43,7 @@ const getOptions = ({ size }: EuiThemeComputed): Array
{i18n.translate(
'xpack.spaces.management.manageSpacePage.solutionViewSelect.searchOptionLabel',
- {
- defaultMessage: 'Search',
- }
+ { defaultMessage: 'Search' }
)}
),
@@ -55,9 +56,7 @@ const getOptions = ({ size }: EuiThemeComputed): Array
{i18n.translate(
'xpack.spaces.management.manageSpacePage.solutionViewSelect.obltOptionLabel',
- {
- defaultMessage: 'Observability',
- }
+ { defaultMessage: 'Observability' }
)}
),
@@ -70,9 +69,7 @@ const getOptions = ({ size }: EuiThemeComputed): Array
{i18n.translate(
'xpack.spaces.management.manageSpacePage.solutionViewSelect.securityOptionLabel',
- {
- defaultMessage: 'Security',
- }
+ { defaultMessage: 'Security' }
)}
),
@@ -85,9 +82,7 @@ const getOptions = ({ size }: EuiThemeComputed): Array
{i18n.translate(
'xpack.spaces.management.manageSpacePage.solutionViewSelect.classicOptionLabel',
- {
- defaultMessage: 'Classic',
- }
+ { defaultMessage: 'Classic' }
)}
),
@@ -112,25 +107,40 @@ export const SolutionView: FunctionComponent = ({
sectionTitle,
}) => {
const { euiTheme } = useEuiTheme();
+ const showClassicDefaultViewCallout = isEditing && space.solution == null;
return (
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -145,20 +155,43 @@ export const SolutionView: FunctionComponent = ({
>
{
onChange({ ...space, solution });
}}
placeholder={i18n.translate(
'xpack.spaces.management.navigation.solutionViewDefaultValue',
- {
- defaultMessage: 'Select view',
- }
+ { defaultMessage: 'Select solution view' }
)}
isInvalid={validator.validateSolutionView(space, isEditing).isInvalid}
/>
+
+ {showClassicDefaultViewCallout && (
+ <>
+
+
+
+
+
+
+
+ )}
diff --git a/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx b/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx
index 4c8617ff007b8..14413b0b2f47b 100644
--- a/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx
@@ -6,7 +6,6 @@
*/
import type { EuiCheckboxProps } from '@elastic/eui';
-import { EuiButton } from '@elastic/eui';
import { waitFor } from '@testing-library/react';
import type { ReactWrapper } from 'enzyme';
import React from 'react';
@@ -23,7 +22,6 @@ import type { SolutionView, Space } from '../../../common/types/latest';
import { EventTracker } from '../../analytics';
import type { SpacesManager } from '../../spaces_manager';
import { spacesManagerMock } from '../../spaces_manager/mocks';
-import { ConfirmAlterActiveSpaceModal } from '../components/confirm_alter_active_space_modal';
import { EnabledFeatures } from '../components/enabled_features';
// To be resolved by EUI team.
@@ -153,8 +151,8 @@ describe('ManageSpacePage', () => {
expect(errors).toEqual([
'Enter a name.',
'Enter a URL identifier.',
+ 'Select a solution.',
'Enter initials.',
- 'Select one solution.',
]);
expect(spacesManager.createSpace).not.toHaveBeenCalled();
@@ -168,7 +166,7 @@ describe('ManageSpacePage', () => {
{
const errors = wrapper.find('div.euiFormErrorText').map((node) => node.text());
- expect(errors).toEqual(['Select one solution.']); // requires solution view to be set
+ expect(errors).toEqual(['Select a solution.']); // requires solution view to be set
}
updateSpace(wrapper, false, 'oblt');
@@ -274,7 +272,13 @@ describe('ManageSpacePage', () => {
expect(wrapper.find('input[name="name"]')).toHaveLength(1);
});
- expect(wrapper.find(EnabledFeatures)).toHaveLength(1);
+ // expect visible features table to exist after setting the Solution View to Classic
+ await waitFor(() => {
+ // switch to classic
+ updateSpace(wrapper, false, 'classic');
+ // expect visible features table to exist again
+ expect(wrapper.find(EnabledFeatures)).toHaveLength(1);
+ });
});
it('hides feature visibility controls when not allowed', async () => {
@@ -333,9 +337,6 @@ describe('ManageSpacePage', () => {
await Promise.resolve();
wrapper.update();
-
- // default for create space: expect visible features table to exist
- expect(wrapper.find(EnabledFeatures)).toHaveLength(1);
});
await waitFor(() => {
@@ -353,147 +354,6 @@ describe('ManageSpacePage', () => {
});
});
- it('allows a space to be updated', async () => {
- const spaceToUpdate = {
- id: 'existing-space',
- name: 'Existing Space',
- description: 'hey an existing space',
- color: '#aabbcc',
- initials: 'AB',
- disabledFeatures: [],
- solution: 'es',
- };
-
- const spacesManager = spacesManagerMock.create();
- spacesManager.getSpace = jest.fn().mockResolvedValue({
- ...spaceToUpdate,
- });
- spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
-
- const onLoadSpace = jest.fn();
-
- const wrapper = mountWithIntl(
-
- );
-
- await waitFor(() => {
- wrapper.update();
- expect(spacesManager.getSpace).toHaveBeenCalledWith('existing-space');
- });
-
- expect(onLoadSpace).toHaveBeenCalledWith({
- ...spaceToUpdate,
- });
-
- await Promise.resolve();
-
- wrapper.update();
-
- updateSpace(wrapper, true, 'oblt');
-
- await clickSaveButton(wrapper);
-
- expect(spacesManager.updateSpace).toHaveBeenCalledWith({
- id: 'existing-space',
- name: 'New Space Name',
- description: 'some description',
- color: '#AABBCC',
- initials: 'AB',
- imageUrl: '',
- disabledFeatures: ['feature-1'],
- solution: 'oblt', // solution has been changed
- });
-
- expect(reportEvent).toHaveBeenCalledWith('space_solution_changed', {
- action: 'edit',
- solution: 'oblt',
- solution_prev: 'es',
- space_id: 'existing-space',
- });
- });
-
- it('sets calculated fields for existing spaces', async () => {
- // The Spaces plugin provides functions to calculate the initials and color of a space if they have not been customized. The new space
- // management page explicitly sets these fields when a new space is created, but it should also handle existing "legacy" spaces that do
- // not already have these fields set.
- const spaceToUpdate = {
- id: 'existing-space',
- name: 'Existing Space',
- description: 'hey an existing space',
- color: undefined,
- initials: undefined,
- imageUrl: undefined,
- disabledFeatures: [],
- };
-
- const spacesManager = spacesManagerMock.create();
- spacesManager.getSpace = jest.fn().mockResolvedValue({
- ...spaceToUpdate,
- });
- spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
-
- const onLoadSpace = jest.fn();
-
- const wrapper = mountWithIntl(
-
- );
-
- await waitFor(() => {
- wrapper.update();
- expect(spacesManager.getSpace).toHaveBeenCalledWith('existing-space');
- });
-
- expect(onLoadSpace).toHaveBeenCalledWith({
- ...spaceToUpdate,
- });
-
- await Promise.resolve();
-
- wrapper.update();
-
- // not changing anything, just clicking the "Update space" button
- await clickSaveButton(wrapper);
-
- expect(spacesManager.updateSpace).toHaveBeenCalledWith({
- ...spaceToUpdate,
- color: '#E7664C',
- initials: 'ES',
- imageUrl: '',
- });
- });
-
it('notifies when there is an error retrieving features', async () => {
const spacesManager = spacesManagerMock.create();
spacesManager.createSpace = jest.fn(spacesManager.createSpace);
@@ -528,119 +388,6 @@ describe('ManageSpacePage', () => {
});
});
});
-
- it('warns when updating features in the active space', async () => {
- const spacesManager = spacesManagerMock.create();
- spacesManager.getSpace = jest.fn().mockResolvedValue({
- id: 'my-space',
- name: 'Existing Space',
- description: 'hey an existing space',
- color: '#aabbcc',
- initials: 'AB',
- disabledFeatures: [],
- });
- spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
-
- const wrapper = mountWithIntl(
-
- );
-
- await waitFor(() => {
- wrapper.update();
- expect(spacesManager.getSpace).toHaveBeenCalledWith('my-space');
- });
-
- await Promise.resolve();
-
- wrapper.update();
-
- updateSpace(wrapper);
-
- await clickSaveButton(wrapper);
-
- const warningDialog = wrapper.find(ConfirmAlterActiveSpaceModal);
- expect(warningDialog).toHaveLength(1);
-
- expect(spacesManager.updateSpace).toHaveBeenCalledTimes(0);
-
- const confirmButton = warningDialog
- .find(EuiButton)
- .find('[data-test-subj="confirmModalConfirmButton"]')
- .find('button');
-
- confirmButton.simulate('click');
-
- await Promise.resolve();
-
- wrapper.update();
-
- expect(spacesManager.updateSpace).toHaveBeenCalledTimes(1);
- });
-
- it('does not warn when features are left alone in the active space', async () => {
- const spacesManager = spacesManagerMock.create();
- spacesManager.getSpace = jest.fn().mockResolvedValue({
- id: 'my-space',
- name: 'Existing Space',
- description: 'hey an existing space',
- color: '#aabbcc',
- initials: 'AB',
- disabledFeatures: [],
- });
- spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
-
- const wrapper = mountWithIntl(
-
- );
-
- await waitFor(() => {
- wrapper.update();
- expect(spacesManager.getSpace).toHaveBeenCalledWith('my-space');
- });
-
- await Promise.resolve();
-
- wrapper.update();
-
- updateSpace(wrapper, false);
-
- await clickSaveButton(wrapper);
-
- const warningDialog = wrapper.find(ConfirmAlterActiveSpaceModal);
- expect(warningDialog).toHaveLength(0);
-
- expect(spacesManager.updateSpace).toHaveBeenCalledTimes(1);
- });
});
function updateSpace(
@@ -680,15 +427,6 @@ function toggleFeature(wrapper: ReactWrapper) {
wrapper.update();
}
-async function clickSaveButton(wrapper: ReactWrapper) {
- const saveButton = wrapper.find('button[data-test-subj="save-space-button"]');
- saveButton.simulate('click');
-
- await Promise.resolve();
-
- wrapper.update();
-}
-
function capitalizeFirstLetter(string: string) {
return string.charAt(0).toUpperCase() + string.slice(1);
}
diff --git a/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx b/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx
index e8204a53fe345..31a5bf885e785 100644
--- a/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx
+++ b/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx
@@ -27,15 +27,15 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import type { Space } from '../../../common';
-import { isReservedSpace } from '../../../common';
+import { SOLUTION_VIEW_CLASSIC } from '../../../common/constants';
import type { EventTracker } from '../../analytics';
import { getSpacesFeatureDescription } from '../../constants';
import { getSpaceColor, getSpaceInitials } from '../../space_avatar';
import type { SpacesManager } from '../../spaces_manager';
import { UnauthorizedPrompt } from '../components';
import { ConfirmAlterActiveSpaceModal } from '../components/confirm_alter_active_space_modal';
+import { CustomizeAvatar } from '../components/customize_avatar';
import { CustomizeSpace } from '../components/customize_space';
-import { DeleteSpacesButton } from '../components/delete_spaces_button';
import { EnabledFeatures } from '../components/enabled_features';
import { SolutionView } from '../components/solution_view';
import { toSpaceIdentifier } from '../lib';
@@ -60,7 +60,6 @@ interface State {
features: KibanaFeature[];
originalSpace?: Partial;
showAlteringActiveSpaceDialog: boolean;
- showVisibleFeaturesPicker: boolean;
haveDisabledFeaturesChanged: boolean;
hasSolutionViewChanged: boolean;
isLoading: boolean;
@@ -80,7 +79,6 @@ export class CreateSpacePage extends Component {
this.state = {
isLoading: true,
showAlteringActiveSpaceDialog: false,
- showVisibleFeaturesPicker: !!props.allowFeatureVisibility,
saveInProgress: false,
space: {
color: getSpaceColor({}),
@@ -185,12 +183,9 @@ export class CreateSpacePage extends Component {
return (
@@ -201,25 +196,30 @@ export class CreateSpacePage extends Component
{
space={this.state.space}
onChange={this.onSolutionViewChange}
validator={this.validator}
- isEditing={this.editingExistingSpace()}
- sectionTitle={i18n.translate(
- 'xpack.spaces.management.manageSpacePage.navigationTitle',
- { defaultMessage: 'Navigation' }
- )}
+ isEditing={false}
/>
)}
- {this.state.showVisibleFeaturesPicker && (
- <>
-
-
-
- )}
+ {this.props.allowFeatureVisibility &&
+ (!this.state.space.solution || this.state.space.solution === SOLUTION_VIEW_CLASSIC) && (
+ <>
+
+
+
+ )}
+
+
+
+
@@ -240,14 +240,6 @@ export class CreateSpacePage extends Component {
};
public getTitle = () => {
- if (this.editingExistingSpace()) {
- return (
-
- );
- }
return (
{
};
public getChangeImpactWarning = () => {
- if (!this.editingExistingSpace()) return null;
const { haveDisabledFeaturesChanged, hasSolutionViewChanged } = this.state;
if (!haveDisabledFeaturesChanged && !hasSolutionViewChanged) return null;
@@ -289,13 +280,6 @@ export class CreateSpacePage extends Component {
}
);
- const updateSpaceText = i18n.translate(
- 'xpack.spaces.management.manageSpacePage.updateSpaceButton',
- {
- defaultMessage: 'Update space',
- }
- );
-
const cancelButtonText = i18n.translate(
'xpack.spaces.management.manageSpacePage.cancelSpaceButton',
{
@@ -303,8 +287,6 @@ export class CreateSpacePage extends Component {
}
);
- const saveText = this.editingExistingSpace() ? updateSpaceText : createSpaceText;
-
return (
@@ -314,7 +296,7 @@ export class CreateSpacePage extends Component {
data-test-subj="save-space-button"
isLoading={this.state.saveInProgress}
>
- {saveText}
+ {createSpaceText}
@@ -323,37 +305,12 @@ export class CreateSpacePage extends Component {
- {this.getActionButton()}
);
};
- public getActionButton = () => {
- if (this.state.space && this.editingExistingSpace() && !isReservedSpace(this.state.space)) {
- return (
-
-
-
- );
- }
-
- return null;
- };
-
private onSolutionViewChange = (space: Partial) => {
- if (this.props.allowFeatureVisibility) {
- let showVisibleFeaturesPicker = false;
- if (space.solution === 'classic' || space.solution == null) {
- showVisibleFeaturesPicker = true;
- }
- this.setState((state) => ({ ...state, showVisibleFeaturesPicker }));
- }
+ this.setState((state) => ({ ...state, solution: space.solution }));
this.onSpaceChange(space);
};
@@ -366,14 +323,8 @@ export class CreateSpacePage extends Component {
public saveSpace = () => {
this.validator.enableValidation();
- const originalSpace: Space = this.state.originalSpace as Space;
const space: Space = this.state.space as Space;
- const { haveDisabledFeaturesChanged, hasSolutionViewChanged } = this.state;
- const result = this.validator.validateForSave(
- space,
- this.editingExistingSpace(),
- this.props.allowSolutionVisibility
- );
+ const result = this.validator.validateForSave(space, false, this.props.allowSolutionVisibility);
if (result.isInvalid) {
this.setState({
formError: result,
@@ -382,24 +333,7 @@ export class CreateSpacePage extends Component {
return;
}
- if (this.editingExistingSpace()) {
- const { spacesManager } = this.props;
-
- spacesManager.getActiveSpace().then((activeSpace) => {
- const editingActiveSpace = activeSpace.id === originalSpace.id;
-
- if (editingActiveSpace && (haveDisabledFeaturesChanged || hasSolutionViewChanged)) {
- this.setState({
- showAlteringActiveSpaceDialog: true,
- });
-
- return;
- }
- this.performSave();
- });
- } else {
- this.performSave();
- }
+ this.performSave();
};
private loadSpace = async (spaceId: string, featuresPromise: Promise) => {
@@ -472,15 +406,8 @@ export class CreateSpacePage extends Component {
solution,
};
- let action;
- const isEditing = this.editingExistingSpace();
const { spacesManager, eventTracker } = this.props;
-
- if (isEditing) {
- action = spacesManager.updateSpace(params);
- } else {
- action = spacesManager.createSpace(params);
- }
+ const action = spacesManager.createSpace(params);
this.setState({ saveInProgress: true });
@@ -493,7 +420,7 @@ export class CreateSpacePage extends Component {
spaceId: id,
solution,
solutionPrev: this.state.originalSpace?.solution,
- action: isEditing ? 'edit' : 'create',
+ action: 'create',
});
};
@@ -536,6 +463,4 @@ export class CreateSpacePage extends Component {
};
private backToSpacesList = () => this.props.history.push('/');
-
- private editingExistingSpace = () => !!this.props.spaceId;
}
diff --git a/x-pack/plugins/spaces/public/management/edit_space/edit_space.tsx b/x-pack/plugins/spaces/public/management/edit_space/edit_space.tsx
index cd2bd76a57928..825bc6977ad1c 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/edit_space.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/edit_space.tsx
@@ -201,8 +201,8 @@ export const EditSpace: FC = ({
-
-
+
+
diff --git a/x-pack/plugins/spaces/public/management/edit_space/edit_space_features_tab.tsx b/x-pack/plugins/spaces/public/management/edit_space/edit_space_features_tab.tsx
deleted file mode 100644
index f5bfbe79ec2d4..0000000000000
--- a/x-pack/plugins/spaces/public/management/edit_space/edit_space_features_tab.tsx
+++ /dev/null
@@ -1,77 +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 { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
-import type { FC } from 'react';
-import React from 'react';
-
-import type { KibanaFeature } from '@kbn/features-plugin/common';
-import { FormattedMessage } from '@kbn/i18n-react';
-
-import { useEditSpaceServices } from './provider';
-import type { Space } from '../../../common';
-import { FeatureTable } from '../components/enabled_features/feature_table';
-import { SectionPanel } from '../components/section_panel';
-
-interface Props {
- space: Partial;
- features: KibanaFeature[];
- onChange: (updatedSpace: Partial) => void;
-}
-
-export const EditSpaceEnabledFeatures: FC = ({ features, space, onChange }) => {
- const { capabilities, getUrlForApp } = useEditSpaceServices();
- const canManageRoles = capabilities.roles?.save === true;
-
- if (!features) {
- return null;
- }
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ) : (
-
- ),
- }}
- />
-
-
-
-
-
-
-
-
- );
-};
diff --git a/x-pack/plugins/spaces/public/management/edit_space/edit_space_general_tab.tsx b/x-pack/plugins/spaces/public/management/edit_space/edit_space_general_tab.tsx
index 24269528916f8..cb82b5f800fbb 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/edit_space_general_tab.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/edit_space_general_tab.tsx
@@ -13,7 +13,6 @@ import type { KibanaFeature } from '@kbn/features-plugin/common';
import { i18n } from '@kbn/i18n';
import { useUnsavedChangesPrompt } from '@kbn/unsaved-changes-prompt';
-import { EditSpaceEnabledFeatures } from './edit_space_features_tab';
import { EditSpaceTabFooter } from './footer';
import { useEditSpaceServices } from './provider';
import type { Space } from '../../../common';
@@ -21,7 +20,9 @@ import { SOLUTION_VIEW_CLASSIC } from '../../../common/constants';
import { getSpaceInitials } from '../../space_avatar';
import { ConfirmDeleteModal } from '../components';
import { ConfirmAlterActiveSpaceModal } from '../components/confirm_alter_active_space_modal';
+import { CustomizeAvatar } from '../components/customize_avatar';
import { CustomizeSpace } from '../components/customize_space';
+import { EnabledFeatures } from '../components/enabled_features';
import { SolutionView } from '../components/solution_view';
import { SpaceValidator } from '../lib';
import type { CustomizeSpaceFormValues } from '../types';
@@ -249,17 +250,15 @@ export const EditSpaceSettingsTab: React.FC = ({ space, features, history
- {i18n.translate(
+ iconType="iInCircle"
+ title={i18n.translate(
'xpack.spaces.management.spaceDetails.spaceChangesWarning.impactAllUsersInSpace',
{
- defaultMessage: 'The changes made will impact all users in the space.',
+ defaultMessage: 'The changes will apply to all users of the space.',
}
)}
-
+ data-test-subj="space-edit-page-user-impact-warning"
+ />
)
);
@@ -289,10 +288,10 @@ export const EditSpaceSettingsTab: React.FC = ({ space, features, history
)}
- {props.allowFeatureVisibility && (solution == null || solution === SOLUTION_VIEW_CLASSIC) && (
+ {props.allowFeatureVisibility && (!solution || solution === SOLUTION_VIEW_CLASSIC) && (
<>
- = ({ space, features, history
)}
+
+
+
+
{doShowUserImpactWarning()}
diff --git a/x-pack/plugins/spaces/public/management/edit_space/footer.tsx b/x-pack/plugins/spaces/public/management/edit_space/footer.tsx
index 013a356f9b400..b00494cbee51c 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/footer.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/footer.tsx
@@ -31,57 +31,57 @@ export const EditSpaceTabFooter: React.FC = ({
onClickSubmit,
onClickDeleteSpace,
}) => {
+ if (isLoading) {
+ return (
+
+
+
+
+
+ );
+ }
+
return (
- <>
- {isLoading && (
-
-
-
-
-
+
+ {isDirty && (
+
+
+
+
+
)}
- {!isLoading && (
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
- {isDirty && (
-
-
-
-
-
- )}
-
- )}
-
+
+
+
+
+
+
);
};
diff --git a/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.tsx b/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.tsx
index 658730a848a33..276efb7f92526 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.tsx
@@ -354,7 +354,7 @@ export const PrivilegesRolesForm: FC = (props) => {
@@ -367,7 +367,8 @@ export const PrivilegesRolesForm: FC = (props) => {
helpText={i18n.translate(
'xpack.spaces.management.spaceDetails.roles.selectRolesHelp',
{
- defaultMessage: 'Select Kibana spaces to which you wish to assign privileges.',
+ defaultMessage:
+ 'Users assigned to selected roles will gain access to this space.',
}
)}
>
@@ -380,6 +381,10 @@ export const PrivilegesRolesForm: FC = (props) => {
values: { spaceName: space.name },
}
)}
+ placeholder={i18n.translate(
+ 'xpack.spaces.management.spaceDetails.roles.selectRolesPlaceholder',
+ { defaultMessage: 'Add a role...' }
+ )}
isLoading={fetchingDataDeps}
options={createRolesComboBoxOptions(spaceUnallocatedRoles)}
selectedOptions={selectedRoles}
diff --git a/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assigned_roles_table.tsx b/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assigned_roles_table.tsx
index 6a1d9f24bc042..ffe7ecba85ec0 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assigned_roles_table.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assigned_roles_table.tsx
@@ -78,6 +78,7 @@ const getTableColumns = ({
name: i18n.translate('xpack.spaces.management.spaceDetails.rolesTable.column.name.title', {
defaultMessage: 'Role',
}),
+ width: '45%',
},
{
field: 'privileges',
@@ -118,25 +119,25 @@ const getTableColumns = ({
{ defaultMessage: 'Role type' }
),
render: (_value: Role['metadata']) => {
- return React.createElement(EuiBadge, {
- children: _value?._reserved
- ? i18n.translate(
+ return _value?._reserved
+ ? React.createElement(EuiBadge, {
+ children: i18n.translate(
'xpack.spaces.management.spaceDetails.rolesTable.column.roleType.reserved',
{ defaultMessage: 'Reserved' }
- )
- : i18n.translate(
- 'xpack.spaces.management.spaceDetails.rolesTable.column.roleType.custom',
- { defaultMessage: 'Custom' }
),
- color: _value?._reserved ? undefined : 'success',
- });
+ color: 'primary',
+ })
+ : null;
},
},
];
if (!isReadOnly) {
columns.push({
- name: 'Actions',
+ name: i18n.translate(
+ 'xpack.spaces.management.spaceDetails.rolesTable.column.actions.columnHeaderName',
+ { defaultMessage: 'Actions' }
+ ),
actions: [
{
type: 'icon',
@@ -163,22 +164,22 @@ const getTableColumns = ({
: i18n.translate(
'xpack.spaces.management.spaceDetails.rolesTable.column.actions.notEditableDescription.isAssignedToAll',
{
- defaultMessage: `Can't perform actions on a role that is assigned to all spaces`,
+ defaultMessage: `You can't edit the access of a role that is assigned to all spaces.`,
}
),
- isPrimary: true,
+ showOnHover: true,
enabled: () => false,
available: (rowRecord) => !isEditableRole(rowRecord),
},
{
type: 'icon',
icon: 'pencil',
+ isPrimary: true,
'data-test-subj': 'spaceRoleCellEditAction',
name: i18n.translate(
'xpack.spaces.management.spaceDetails.rolesTable.column.actions.edit.title',
{ defaultMessage: 'Remove from space' }
),
- isPrimary: true,
description: i18n.translate(
'xpack.spaces.management.spaceDetails.rolesTable.column.actions.edit.description',
{
@@ -186,15 +187,14 @@ const getTableColumns = ({
'Click this action to edit the role privileges of this user for this space.',
}
),
- showOnHover: true,
available: (rowRecord) => isEditableRole(rowRecord),
onClick: onClickRowEditAction,
},
{
- isPrimary: true,
type: 'icon',
icon: 'trash',
color: 'danger',
+ isPrimary: true,
'data-test-subj': 'spaceRoleCellDeleteAction',
name: i18n.translate(
'xpack.spaces.management.spaceDetails.rolesTable.column.actions.remove.title',
@@ -204,7 +204,6 @@ const getTableColumns = ({
'xpack.spaces.management.spaceDetails.rolesTable.column.actions.edit.description',
{ defaultMessage: 'Click this action to remove the user from this space.' }
),
- showOnHover: true,
available: (rowRecord) => isEditableRole(rowRecord),
onClick: onClickRowRemoveAction,
},
diff --git a/x-pack/plugins/spaces/public/management/lib/validate_space.ts b/x-pack/plugins/spaces/public/management/lib/validate_space.ts
index 7a7980028dad0..89205cc91f2ef 100644
--- a/x-pack/plugins/spaces/public/management/lib/validate_space.ts
+++ b/x-pack/plugins/spaces/public/management/lib/validate_space.ts
@@ -181,7 +181,7 @@ export class SpaceValidator {
if (!space.solution) {
return invalid(
i18n.translate('xpack.spaces.management.validateSpace.requiredSolutionViewErrorMessage', {
- defaultMessage: 'Select one solution.',
+ defaultMessage: 'Select a solution.',
})
);
}
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
index 091057a2f4a4c..c8707f8959f0c 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
@@ -95,7 +95,7 @@ describe('SpacesGridPage', () => {
expect(wrapper.find('EuiInMemoryTable').prop('items')).toBe(spaces);
expect(wrapper.find('EuiInMemoryTable').prop('columns')).not.toContainEqual({
field: 'solution',
- name: 'Solution View',
+ name: 'Solution view',
sortable: true,
render: expect.any(Function),
});
@@ -155,7 +155,7 @@ describe('SpacesGridPage', () => {
expect(wrapper.find('EuiInMemoryTable').prop('items')).toBe(spacesWithSolution);
expect(wrapper.find('EuiInMemoryTable').prop('columns')).toContainEqual({
field: 'solution',
- name: 'Solution View',
+ name: 'Solution view',
sortable: true,
render: expect.any(Function),
});
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index 5ac3ecf0ca687..462b65f327ebc 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -10,7 +10,7 @@ import {
type EuiBasicTableColumn,
EuiButton,
EuiCallOut,
- EuiFlexGroup,
+ EuiFlexGrid,
EuiFlexItem,
EuiInMemoryTable,
EuiLink,
@@ -19,6 +19,7 @@ import {
EuiPageSection,
EuiSpacer,
EuiText,
+ useIsWithinBreakpoints,
} from '@elastic/eui';
import React, { Component, lazy, Suspense } from 'react';
@@ -152,9 +153,7 @@ export class SpacesGridPage extends Component {
box: {
placeholder: i18n.translate(
'xpack.spaces.management.spacesGridPage.searchPlaceholder',
- {
- defaultMessage: 'Search',
- }
+ { defaultMessage: 'Search' }
),
},
}}
@@ -281,28 +280,49 @@ export class SpacesGridPage extends Component {
defaultMessage: 'Space',
}),
sortable: true,
- render: (value: string, rowRecord: Space) => (
-
-
- {
+ const SpaceName = () => {
+ const isCurrent = this.state.activeSpace?.id === rowRecord.id;
+ const isWide = useIsWithinBreakpoints(['xl']);
+ const gridColumns = isCurrent && isWide ? 2 : 1;
+ return (
+
- {value}
-
-
- {this.state.activeSpace?.id === rowRecord.id && (
-
-
- {i18n.translate('xpack.spaces.management.spacesGridPage.currentSpaceMarkerText', {
- defaultMessage: 'current',
- })}
-
-
- )}
-
- ),
+
+
+ {value}
+
+
+
+ {isCurrent && (
+
+
+ {i18n.translate(
+ 'xpack.spaces.management.spacesGridPage.currentSpaceMarkerText',
+ { defaultMessage: 'current' }
+ )}
+
+
+ )}
+
+
+ );
+ };
+
+ return ;
+ },
'data-test-subj': 'spacesListTableRowNameCell',
+ width: '15%',
},
{
field: 'description',
@@ -311,7 +331,7 @@ export class SpacesGridPage extends Component {
}),
sortable: true,
truncateText: true,
- width: '30%',
+ width: '45%',
},
];
@@ -331,7 +351,7 @@ export class SpacesGridPage extends Component {
return (
);
}
@@ -377,7 +397,7 @@ export class SpacesGridPage extends Component {
config.push({
field: 'solution',
name: i18n.translate('xpack.spaces.management.spacesGridPage.solutionColumnName', {
- defaultMessage: 'Solution View',
+ defaultMessage: 'Solution view',
}),
sortable: true,
render: (solution: Space['solution'], record: Space) => (
diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
index f444b45192f8b..8e14b2876f429 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
@@ -3,8 +3,9 @@
}
.spcMenu__spacesList {
- @include euiYScrollWithShadows;
max-height: $euiSizeXL * 10;
+
+ @include euiYScrollWithShadows;
}
.spcMenu__searchFieldWrapper {
diff --git a/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap b/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
index 8dfe89ef172d4..4419707ab45f4 100644
--- a/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`it renders with custom logo 1`] = `
>
@@ -69,7 +69,7 @@ exports[`it renders without crashing 1`] = `
>
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.scss b/x-pack/plugins/spaces/public/space_selector/space_selector.scss
index 4629e92a201f5..f589347e592ed 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector.scss
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector.scss
@@ -4,6 +4,9 @@
.spcSelectorBackground {
@include kibanaFullScreenGraphics;
+}
+
+.spcSelectorBackground__nonMixinAttributes {
z-index: -1;
pointer-events: none;
}
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
index e90d1c4a10954..3d72392552e38 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
@@ -124,7 +124,10 @@ export class SpaceSelector extends Component {
>
{/* Portal the fixed background graphic so it doesn't affect page positioning or overlap on top of global banners */}
-
+
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/crowdstrike_connector.tsx b/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/crowdstrike_connector.tsx
index 3af2cd8c4648a..b468cd3bbb712 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/crowdstrike_connector.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/crowdstrike_connector.tsx
@@ -15,13 +15,11 @@ import {
} from '@kbn/triggers-actions-ui-plugin/public';
import * as i18n from './translations';
-const CROWDSTRIKE_DEFAULT_API_URL = 'https://api.crowdstrike.com';
const configFormSchema: ConfigFieldSchema[] = [
{
id: 'url',
label: i18n.URL_LABEL,
isUrlField: true,
- defaultValue: CROWDSTRIKE_DEFAULT_API_URL,
},
];
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/translations.ts b/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/translations.ts
index 1fb91cecfe992..e10226f532914 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/translations.ts
+++ b/x-pack/plugins/stack_connectors/public/connector_types/crowdstrike/translations.ts
@@ -19,14 +19,14 @@ export const URL_LABEL = i18n.translate(
export const CLIENT_ID_LABEL = i18n.translate(
'xpack.stackConnectors.security.crowdstrike.config.clientIdTextFieldLabel',
{
- defaultMessage: 'Crowdstrike client ID',
+ defaultMessage: 'Crowdstrike Client ID',
}
);
export const CLIENT_SECRET_LABEL = i18n.translate(
'xpack.stackConnectors.security.crowdstrike.config.clientSecretTextFieldLabel',
{
- defaultMessage: 'Client secret',
+ defaultMessage: 'Client Secret',
}
);
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 6e6b150b41c0a..178c036061fdd 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -35248,7 +35248,6 @@
"xpack.securitySolution.appLinks.network.flows": "Flux",
"xpack.securitySolution.appLinks.network.http": "HTTP",
"xpack.securitySolution.appLinks.network.tls": "TLS",
- "xpack.securitySolution.appLinks.notesManagementDescription": "Visualisez et supprimez des notes.",
"xpack.securitySolution.appLinks.overview": "Aperçu",
"xpack.securitySolution.appLinks.overviewDescription": "Résumé de votre activité d'environnement de sécurité, y compris les alertes, les événements, les éléments récents et un fil d'actualités !",
"xpack.securitySolution.appLinks.policiesDescription": "Utilisez les politiques pour personnaliser les protections des points de terminaison et de charge de travail cloud, et d'autres configurations.",
@@ -37770,7 +37769,6 @@
"xpack.securitySolution.endpoint.list.loadingPolicies": "Chargement des intégrations",
"xpack.securitySolution.endpoint.list.noEndpointsInstructions": "Vous avez ajouté l'intégration Elastic Defend. Vous pouvez maintenant enregistrer vos agents en suivant la procédure ci-dessous.",
"xpack.securitySolution.endpoint.list.noEndpointsPrompt": "Étape suivante : Enregistrer un agent avec Elastic Defend",
- "xpack.securitySolution.endpoint.list.noPolicies": "Il n'existe aucune intégration.",
"xpack.securitySolution.endpoint.list.os": "Système d'exploitation",
"xpack.securitySolution.endpoint.list.pageSubTitle": "Hôtes exécutant Elastic Defend",
"xpack.securitySolution.endpoint.list.pageTitle": "Points de terminaison",
@@ -39504,7 +39502,6 @@
"xpack.securitySolution.navigation.manage": "Gérer",
"xpack.securitySolution.navigation.network": "Réseau",
"xpack.securitySolution.navigation.newRuleTitle": "Créer une nouvelle règle",
- "xpack.securitySolution.navigation.notesManagement": "Notes",
"xpack.securitySolution.navigation.overview": "Aperçu",
"xpack.securitySolution.navigation.protectionUpdates": "Mises à jour de la protection",
"xpack.securitySolution.navigation.responseActionsHistory": "Historique des actions de réponse",
@@ -42708,8 +42705,6 @@
"xpack.spaces.management.deselectAllFeaturesLink": "Tout masquer",
"xpack.spaces.management.enabledFeatures.featureCategoryButtonLabel": "Touche bascule de catégorie",
"xpack.spaces.management.enabledSpaceFeatures.enableFeaturesInSpaceMessage": "Définir la visibilité des fonctionnalités",
- "xpack.spaces.management.enabledSpaceFeatures.manageRolesLinkText": "gérer les rôles de sécurité",
- "xpack.spaces.management.enabledSpaceFeatures.notASecurityMechanismMessage": "Les fonctionnalités masquées sont supprimées de l'interface utilisateur, mais pas désactivées. Pour sécuriser l'accès aux fonctionnalités, {manageRolesLink}.",
"xpack.spaces.management.featureAccordionSwitchLabel": "{enabledCount} fonctionnalités visibles / {featureCount}",
"xpack.spaces.management.featureVisibilityTitle": "Visibilité des fonctionnalités",
"xpack.spaces.management.hideAllFeaturesText": "Tout masquer",
@@ -42721,15 +42716,11 @@
"xpack.spaces.management.manageSpacePage.createSpaceTitle": "Créer l'espace",
"xpack.spaces.management.manageSpacePage.describeSpaceDescription": "Attribuez à votre espace un nom facile à retenir.",
"xpack.spaces.management.manageSpacePage.describeSpaceTitle": "Décrire cet espace",
- "xpack.spaces.management.manageSpacePage.editSpaceTitle": "Modifier l'espace",
"xpack.spaces.management.manageSpacePage.errorLoadingSpaceTitle": "Erreur lors du chargement de l'espace : {message}",
"xpack.spaces.management.manageSpacePage.errorSavingSpaceTitle": "Erreur lors de l'enregistrement de l'espace : {message}",
- "xpack.spaces.management.manageSpacePage.featuresTitle": "Fonctionnalités",
- "xpack.spaces.management.manageSpacePage.generalTitle": "Général",
"xpack.spaces.management.manageSpacePage.loadErrorTitle": "Erreur lors du chargement des fonctionnalités disponibles",
"xpack.spaces.management.manageSpacePage.loadingMessage": "Chargement…",
"xpack.spaces.management.manageSpacePage.nameFormRowLabel": "Nom",
- "xpack.spaces.management.manageSpacePage.navigationTitle": "Navigation",
"xpack.spaces.management.manageSpacePage.optionalLabel": "Facultatif",
"xpack.spaces.management.manageSpacePage.setSolutionViewDescription": "Détermine la navigation que tous les utilisateurs verront pour cet espace. Chaque vue de solution contient des fonctionnalités de Outils d'analyse et de Gestion.",
"xpack.spaces.management.manageSpacePage.setSolutionViewMessage": "Définir la vue de la solution",
@@ -42740,7 +42731,6 @@
"xpack.spaces.management.manageSpacePage.spaceDescriptionFormRowLabel": "Description",
"xpack.spaces.management.manageSpacePage.spaceDescriptionHelpText": "La description s'affiche sur l'écran de sélection de l'espace.",
"xpack.spaces.management.manageSpacePage.spaceSuccessfullySavedNotificationMessage": "L'espace {name} a été enregistré.",
- "xpack.spaces.management.manageSpacePage.updateSpaceButton": "Mettre à jour l'espace",
"xpack.spaces.management.navigation.solutionViewLabel": "Afficher la solution",
"xpack.spaces.management.reversedSpaceBadge.reversedSpacesCanBePartiallyModifiedTooltip": "Les espaces réservés sont intégrés et ne peuvent être que partiellement modifiés.",
"xpack.spaces.management.selectAllFeaturesLink": "Afficher tout",
@@ -43883,11 +43873,9 @@
"xpack.synthetics.alertRules.monitorStatus.actionVariables.state.status": "Statut du moniteur (par ex. \"arrêté\").",
"xpack.synthetics.alertRules.monitorStatus.browser.label": "navigateur",
"xpack.synthetics.alertRules.monitorStatus.host.label": "Hôte",
- "xpack.synthetics.alertRules.monitorStatus.reasonMessage": "Le moniteur \"{name}\" de {location} est {status}. Vérifié à {checkedAt}.",
"xpack.synthetics.alertRules.monitorStatus.unavailableUrlLabel": "(indisponible)",
"xpack.synthetics.alerts.monitorStatus.absoluteLink.label": "- Lien",
"xpack.synthetics.alerts.monitorStatus.defaultRecovery.status": "a récupéré",
- "xpack.synthetics.alerts.monitorStatus.deleteMonitor.reason": "le moniteur a été supprimé",
"xpack.synthetics.alerts.monitorStatus.deleteMonitor.status": "a été supprimé",
"xpack.synthetics.alerts.monitorStatus.downLabel": "bas",
"xpack.synthetics.alerts.monitorStatus.relativeLink.label": "- Lien relatif",
@@ -43897,7 +43885,6 @@
"xpack.synthetics.alerts.monitorStatus.upCheck.status": "est désormais disponible",
"xpack.synthetics.alerts.settings.addConnector": "Ajouter un connecteur",
"xpack.synthetics.alerts.syntheticsMonitorStatus.clientName": "Statut du moniteur",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultRecoverySubjectMessage": "\"{monitorName}\" ({locationName}) {recoveryStatus} - Elastic Synthetics",
"xpack.synthetics.alerts.syntheticsMonitorStatus.description": "Alerte lorsqu'un moniteur est arrêté.",
"xpack.synthetics.alerts.syntheticsMonitorTLS.defaultRecoverySubjectMessage": "L'alerte a été résolue pour le certificat {commonName} - Elastic Synthetics",
"xpack.synthetics.alerts.syntheticsMonitorTLS.defaultSubjectMessage": "L'alerte a été déclenchée pour le certificat {commonName} - Elastic Synthetics",
@@ -47697,4 +47684,4 @@
"xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "Ce champ est requis.",
"xpack.watcher.watcherDescription": "Détectez les modifications survenant dans vos données en créant, gérant et monitorant des alertes."
}
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 337d7ce48044d..e577a0253528d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -34992,7 +34992,6 @@
"xpack.securitySolution.appLinks.network.flows": "Flow",
"xpack.securitySolution.appLinks.network.http": "HTTP",
"xpack.securitySolution.appLinks.network.tls": "TLS",
- "xpack.securitySolution.appLinks.notesManagementDescription": "メモを可視化して、削除します。",
"xpack.securitySolution.appLinks.overview": "概要",
"xpack.securitySolution.appLinks.overviewDescription": "アラート、イベント、最近のアイテム、ニュースフィードを含む、セキュリティ環境アクティビティの概要。",
"xpack.securitySolution.appLinks.policiesDescription": "ポリシーを使用して、エンドポイントおよびクラウドワークロード保護、ならびに他の構成をカスタマイズします。",
@@ -37512,7 +37511,6 @@
"xpack.securitySolution.endpoint.list.loadingPolicies": "統合を読み込んでいます",
"xpack.securitySolution.endpoint.list.noEndpointsInstructions": "Elastic Defend統合を追加しました。次の手順を使用して、エージェントを登録してください。",
"xpack.securitySolution.endpoint.list.noEndpointsPrompt": "次のステップ：Elastic Defendにエージェントを登録する",
- "xpack.securitySolution.endpoint.list.noPolicies": "統合はありません。",
"xpack.securitySolution.endpoint.list.os": "OS",
"xpack.securitySolution.endpoint.list.pageSubTitle": "Elastic Defendを実行しているホスト",
"xpack.securitySolution.endpoint.list.pageTitle": "エンドポイント",
@@ -39247,7 +39245,6 @@
"xpack.securitySolution.navigation.manage": "管理",
"xpack.securitySolution.navigation.network": "ネットワーク",
"xpack.securitySolution.navigation.newRuleTitle": "新規ルールを作成",
- "xpack.securitySolution.navigation.notesManagement": "メモ",
"xpack.securitySolution.navigation.overview": "概要",
"xpack.securitySolution.navigation.protectionUpdates": "保護更新",
"xpack.securitySolution.navigation.responseActionsHistory": "対応アクション履歴",
@@ -42448,8 +42445,6 @@
"xpack.spaces.management.deselectAllFeaturesLink": "すべて非表示",
"xpack.spaces.management.enabledFeatures.featureCategoryButtonLabel": "カテゴリ切り替え",
"xpack.spaces.management.enabledSpaceFeatures.enableFeaturesInSpaceMessage": "機能の表示を設定",
- "xpack.spaces.management.enabledSpaceFeatures.manageRolesLinkText": "セキュリティロールを管理",
- "xpack.spaces.management.enabledSpaceFeatures.notASecurityMechanismMessage": "非表示の機能はユーザーインターフェイスから削除されますが、無効にされません。機能へのアクセスを保護するには、{manageRolesLink}してください。",
"xpack.spaces.management.featureAccordionSwitchLabel": "{featureCount} 件中 {enabledCount} 件の機能を表示中",
"xpack.spaces.management.featureVisibilityTitle": "機能の表示",
"xpack.spaces.management.hideAllFeaturesText": "すべて非表示",
@@ -42461,15 +42456,11 @@
"xpack.spaces.management.manageSpacePage.createSpaceTitle": "スペースを作成",
"xpack.spaces.management.manageSpacePage.describeSpaceDescription": "スペースに覚えやすい名前を付けます。",
"xpack.spaces.management.manageSpacePage.describeSpaceTitle": "このスペースを説明",
- "xpack.spaces.management.manageSpacePage.editSpaceTitle": "スペースの編集",
"xpack.spaces.management.manageSpacePage.errorLoadingSpaceTitle": "スペースの読み込み中にエラーが発生：{message}",
"xpack.spaces.management.manageSpacePage.errorSavingSpaceTitle": "スペースの保存中にエラーが発生：{message}",
- "xpack.spaces.management.manageSpacePage.featuresTitle": "機能",
- "xpack.spaces.management.manageSpacePage.generalTitle": "一般",
"xpack.spaces.management.manageSpacePage.loadErrorTitle": "利用可能な機能の読み込みエラー",
"xpack.spaces.management.manageSpacePage.loadingMessage": "読み込み中…",
"xpack.spaces.management.manageSpacePage.nameFormRowLabel": "名前",
- "xpack.spaces.management.manageSpacePage.navigationTitle": "ナビゲーション",
"xpack.spaces.management.manageSpacePage.optionalLabel": "オプション",
"xpack.spaces.management.manageSpacePage.setSolutionViewDescription": "すべてのユーザーにこのスペースで表示されるナビゲーションを決定します。各ソリューションビューには、分析ツールと管理の機能が含まれます。",
"xpack.spaces.management.manageSpacePage.setSolutionViewMessage": "ソリューションビューを設定",
@@ -42480,7 +42471,6 @@
"xpack.spaces.management.manageSpacePage.spaceDescriptionFormRowLabel": "説明",
"xpack.spaces.management.manageSpacePage.spaceDescriptionHelpText": "説明はスペース選択画面に表示されます。",
"xpack.spaces.management.manageSpacePage.spaceSuccessfullySavedNotificationMessage": "スペース {name} が保存されました。",
- "xpack.spaces.management.manageSpacePage.updateSpaceButton": "スペースを更新",
"xpack.spaces.management.navigation.solutionViewLabel": "ソリューションビュー",
"xpack.spaces.management.reversedSpaceBadge.reversedSpacesCanBePartiallyModifiedTooltip": "リザーブされたスペースはビルトインのため、部分的な変更しかできません。",
"xpack.spaces.management.selectAllFeaturesLink": "すべて表示",
@@ -43622,11 +43612,9 @@
"xpack.synthetics.alertRules.monitorStatus.actionVariables.state.status": "監視ステータス（例：「ダウン」）。",
"xpack.synthetics.alertRules.monitorStatus.browser.label": "ブラウザー",
"xpack.synthetics.alertRules.monitorStatus.host.label": "ホスト",
- "xpack.synthetics.alertRules.monitorStatus.reasonMessage": "{location}のモニター\"{name}\"は{status}です。{checkedAt}に確認されました。",
"xpack.synthetics.alertRules.monitorStatus.unavailableUrlLabel": "（使用不可）",
"xpack.synthetics.alerts.monitorStatus.absoluteLink.label": "- リンク",
"xpack.synthetics.alerts.monitorStatus.defaultRecovery.status": "回復しました",
- "xpack.synthetics.alerts.monitorStatus.deleteMonitor.reason": "モニターが削除されました",
"xpack.synthetics.alerts.monitorStatus.deleteMonitor.status": "が削除されました",
"xpack.synthetics.alerts.monitorStatus.downLabel": "ダウン",
"xpack.synthetics.alerts.monitorStatus.relativeLink.label": "- 相対リンク",
@@ -43636,10 +43624,6 @@
"xpack.synthetics.alerts.monitorStatus.upCheck.status": "現在起動しています",
"xpack.synthetics.alerts.settings.addConnector": "コネクターの追加",
"xpack.synthetics.alerts.syntheticsMonitorStatus.clientName": "監視ステータス",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultActionMessage": "{locationName}の\"{monitorName}\"は{status}です - Elastic Synthetics\n\n詳細：\n\n- モニター名：{monitorName} \n- {monitorUrlLabel}: {monitorUrl} \n- モニタータイプ：{monitorType} \n- 確認日時：{checkedAt} \n- 開始場所：{locationName} \n- 受信したエラー：{lastErrorMessage} \n{linkMessage}",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultRecoveryMessage": "{locationName}の\"{monitorName}\"のアラートはアクティブではありません：{recoveryReason} - Elastic Synthetics\n\n詳細：\n\n- モニター名：{monitorName} \n- {monitorUrlLabel}: {monitorUrl} \n- モニタータイプ：{monitorType} \n- 開始場所：{locationName} \n- 前回受信したエラー：{lastErrorMessage} \n{linkMessage}",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultRecoverySubjectMessage": "\"{monitorName}\" ({locationName}) {recoveryStatus} - Elastic Synthetics",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultSubjectMessage": "\"{monitorName}\" ({locationName})は停止しています - Elastic Synthetics",
"xpack.synthetics.alerts.syntheticsMonitorStatus.description": "モニターがダウンしているときにアラートを通知します。",
"xpack.synthetics.alerts.syntheticsMonitorTLS.defaultRecoverySubjectMessage": "証明書{commonName}のアラートが解決しました - Elastic Synthetics",
"xpack.synthetics.alerts.syntheticsMonitorTLS.defaultSubjectMessage": "証明書{commonName}のアラートがトリガーされました - Elastic Synthetics",
@@ -44481,8 +44465,6 @@
"xpack.synthetics.rules.tls.agingLabel": "古すぎます",
"xpack.synthetics.rules.tls.clientName": "シンセティックTLS",
"xpack.synthetics.rules.tls.criteriaExpression.ariaLabel": "このアラートで監視されているモニターの条件を示す式",
- "xpack.synthetics.rules.tls.defaultActionMessage": "TLS証明書{commonName} {status} - Elastic Synthetics\n\n詳細：\n\n- 概要：{summary}\n- 共通名：{commonName}\n- 発行元：{issuer}\n- モニター：{monitorName} \n- モニターURL：{monitorUrl} \n- モニタータイプ：{monitorType} \n- 開始場所：{locationName}",
- "xpack.synthetics.rules.tls.defaultRecoveryMessage": "モニター\"{monitorName}\"のTLSアラートが回復しました - Elastic Synthetics\n\n詳細：\n\n- 概要：{summary}\n- 新しいステータス：{newStatus}\n- 前のステータス：{previousStatus}\n- モニター：{monitorName} \n- URL：{monitorUrl} \n- モニタータイプ：{monitorType} \n- 開始場所：{locationName}",
"xpack.synthetics.rules.tls.description": "シンセティック監視のTLS証明書の有効期限が近いときにアラートを発行します。",
"xpack.synthetics.rules.tls.expiredLabel": "有効期限切れです",
"xpack.synthetics.rules.tls.expiringLabel": "まもなく有効期限切れです",
@@ -47439,4 +47421,4 @@
"xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
"xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。"
}
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 1a9f83673da10..fdf02dcc6a752 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -35036,7 +35036,6 @@
"xpack.securitySolution.appLinks.network.flows": "流",
"xpack.securitySolution.appLinks.network.http": "HTTP",
"xpack.securitySolution.appLinks.network.tls": "TLS",
- "xpack.securitySolution.appLinks.notesManagementDescription": "可视化并删除备注。",
"xpack.securitySolution.appLinks.overview": "概览",
"xpack.securitySolution.appLinks.overviewDescription": "您的安全环境活动摘要，包括告警、事件、最近项和新闻源！",
"xpack.securitySolution.appLinks.policiesDescription": "使用策略定制终端和云工作负载防护及其他配置。",
@@ -37558,7 +37557,6 @@
"xpack.securitySolution.endpoint.list.loadingPolicies": "正在加载集成",
"xpack.securitySolution.endpoint.list.noEndpointsInstructions": "您已添加 Elastic Defend 集成。现在，按照以下步骤注册您的代理。",
"xpack.securitySolution.endpoint.list.noEndpointsPrompt": "下一步：将代理注册到 Elastic Defend",
- "xpack.securitySolution.endpoint.list.noPolicies": "没有集成。",
"xpack.securitySolution.endpoint.list.os": "OS",
"xpack.securitySolution.endpoint.list.pageSubTitle": "运行 Elastic Defend 的主机",
"xpack.securitySolution.endpoint.list.pageTitle": "终端",
@@ -39293,7 +39291,6 @@
"xpack.securitySolution.navigation.manage": "管理",
"xpack.securitySolution.navigation.network": "网络",
"xpack.securitySolution.navigation.newRuleTitle": "创建新规则",
- "xpack.securitySolution.navigation.notesManagement": "备注",
"xpack.securitySolution.navigation.overview": "概览",
"xpack.securitySolution.navigation.protectionUpdates": "防护更新",
"xpack.securitySolution.navigation.responseActionsHistory": "响应操作历史记录",
@@ -42498,8 +42495,6 @@
"xpack.spaces.management.deselectAllFeaturesLink": "全部隐藏",
"xpack.spaces.management.enabledFeatures.featureCategoryButtonLabel": "类别切换",
"xpack.spaces.management.enabledSpaceFeatures.enableFeaturesInSpaceMessage": "设置功能可见性",
- "xpack.spaces.management.enabledSpaceFeatures.manageRolesLinkText": "管理安全角色",
- "xpack.spaces.management.enabledSpaceFeatures.notASecurityMechanismMessage": "将会从用户界面移除隐藏的功能，但不会禁用。要获取功能的访问权限，{manageRolesLink}。",
"xpack.spaces.management.featureAccordionSwitchLabel": "{enabledCount}/{featureCount} 个功能可见",
"xpack.spaces.management.featureVisibilityTitle": "功能可见性",
"xpack.spaces.management.hideAllFeaturesText": "全部隐藏",
@@ -42511,15 +42506,11 @@
"xpack.spaces.management.manageSpacePage.createSpaceTitle": "创建工作区",
"xpack.spaces.management.manageSpacePage.describeSpaceDescription": "为您的工作区提供好记的名称。",
"xpack.spaces.management.manageSpacePage.describeSpaceTitle": "描述此工作区",
- "xpack.spaces.management.manageSpacePage.editSpaceTitle": "编辑工作区",
"xpack.spaces.management.manageSpacePage.errorLoadingSpaceTitle": "加载空间时出错：{message}",
"xpack.spaces.management.manageSpacePage.errorSavingSpaceTitle": "保存空间时出错：{message}",
- "xpack.spaces.management.manageSpacePage.featuresTitle": "功能",
- "xpack.spaces.management.manageSpacePage.generalTitle": "常规",
"xpack.spaces.management.manageSpacePage.loadErrorTitle": "加载可用功能时出错",
"xpack.spaces.management.manageSpacePage.loadingMessage": "正在加载……",
"xpack.spaces.management.manageSpacePage.nameFormRowLabel": "名称",
- "xpack.spaces.management.manageSpacePage.navigationTitle": "导航",
"xpack.spaces.management.manageSpacePage.optionalLabel": "可选",
"xpack.spaces.management.manageSpacePage.setSolutionViewDescription": "确定所有用户将在此工作区看到的导航。每个解决方案视图均包含来自分析工具的功能和管理功能。",
"xpack.spaces.management.manageSpacePage.setSolutionViewMessage": "设置解决方案视图",
@@ -42530,7 +42521,6 @@
"xpack.spaces.management.manageSpacePage.spaceDescriptionFormRowLabel": "描述",
"xpack.spaces.management.manageSpacePage.spaceDescriptionHelpText": "描述显示在“工作区选择”屏幕上。",
"xpack.spaces.management.manageSpacePage.spaceSuccessfullySavedNotificationMessage": "空间 “{name}” 已保存。",
- "xpack.spaces.management.manageSpacePage.updateSpaceButton": "更新工作区",
"xpack.spaces.management.navigation.solutionViewLabel": "解决方案视图",
"xpack.spaces.management.reversedSpaceBadge.reversedSpacesCanBePartiallyModifiedTooltip": "保留的工作区是内置的，只能进行部分修改。",
"xpack.spaces.management.selectAllFeaturesLink": "全部显示",
@@ -43673,11 +43663,9 @@
"xpack.synthetics.alertRules.monitorStatus.actionVariables.state.status": "监测状态（例如“关闭”）。",
"xpack.synthetics.alertRules.monitorStatus.browser.label": "浏览器",
"xpack.synthetics.alertRules.monitorStatus.host.label": "主机",
- "xpack.synthetics.alertRules.monitorStatus.reasonMessage": "来自 {location} 的监测“{name}”为 {status} 状态。已于 {checkedAt} 检查。",
"xpack.synthetics.alertRules.monitorStatus.unavailableUrlLabel": "（不可用）",
"xpack.synthetics.alerts.monitorStatus.absoluteLink.label": "- 链接",
"xpack.synthetics.alerts.monitorStatus.defaultRecovery.status": "已恢复",
- "xpack.synthetics.alerts.monitorStatus.deleteMonitor.reason": "此监测已删除",
"xpack.synthetics.alerts.monitorStatus.deleteMonitor.status": "已删除",
"xpack.synthetics.alerts.monitorStatus.downLabel": "关闭",
"xpack.synthetics.alerts.monitorStatus.relativeLink.label": "- 相对链接",
@@ -43687,10 +43675,6 @@
"xpack.synthetics.alerts.monitorStatus.upCheck.status": "现已打开",
"xpack.synthetics.alerts.settings.addConnector": "添加连接器",
"xpack.synthetics.alerts.syntheticsMonitorStatus.clientName": "监测状态",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultActionMessage": "来自 {locationName} 的“{monitorName}”为 {status}。- Elastic Synthetics\n\n详情：\n\n- 监测名称：{monitorName} \n- {monitorUrlLabel}：{monitorUrl} \n- 监测类型：{monitorType} \n- 检查时间：{checkedAt} \n- 来自：{locationName} \n- 收到错误：{lastErrorMessage} \n{linkMessage}",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultRecoveryMessage": "来自 {locationName} 的“{monitorName}”的告警不再处于活动状态：{recoveryReason}。- Elastic Synthetics\n\n详情：\n\n- 监测名称：{monitorName} \n- {monitorUrlLabel}：{monitorUrl} \n- 监测类型：{monitorType} \n- 来自：{locationName} \n- 收到的上一个错误：{lastErrorMessage} \n{linkMessage}",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultRecoverySubjectMessage": "“{monitorName}”({locationName}) {recoveryStatus} - Elastic Synthetics",
- "xpack.synthetics.alerts.syntheticsMonitorStatus.defaultSubjectMessage": "“{monitorName}”({locationName}) 已关闭 - Elastic Synthetics",
"xpack.synthetics.alerts.syntheticsMonitorStatus.description": "监测关闭时告警。",
"xpack.synthetics.alerts.syntheticsMonitorTLS.defaultRecoverySubjectMessage": "告警已解析证书 {commonName} - Elastic Synthetics",
"xpack.synthetics.alerts.syntheticsMonitorTLS.defaultSubjectMessage": "已针对证书 {commonName} 触发告警 - Elastic Synthetics",
@@ -44532,8 +44516,6 @@
"xpack.synthetics.rules.tls.agingLabel": "过旧",
"xpack.synthetics.rules.tls.clientName": "Synthetics TLS",
"xpack.synthetics.rules.tls.criteriaExpression.ariaLabel": "显示正由此告警监视的监测条件的表达式",
- "xpack.synthetics.rules.tls.defaultActionMessage": "TLS 证书 {commonName} {status} - Elastic Synthetics\n\n详情：\n\n- 摘要：{summary}\n- 常见名称：{commonName}\n- 颁发者：{issuer}\n- 监测：{monitorName} \n- 监测 URL：{monitorUrl} \n- 监测类型：{monitorType} \n- 来自：{locationName}",
- "xpack.synthetics.rules.tls.defaultRecoveryMessage": "监测“{monitorName}”的 TLS 告警已恢复 - Elastic Synthetics\n\n详情：\n\n- 摘要：{summary}\n- 新状态：{newStatus}\n- 之前的状态：{previousStatus}\n- 监测：{monitorName} \n- URL：{monitorUrl} \n- 监测类型：{monitorType} \n- 来自：{locationName}",
"xpack.synthetics.rules.tls.description": "Synthetics 监测的 TLS 证书即将到期时告警。",
"xpack.synthetics.rules.tls.expiredLabel": "已过期",
"xpack.synthetics.rules.tls.expiringLabel": "即将到期",
@@ -47493,4 +47475,4 @@
"xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
"xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
}
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
index a0742ebfd2bbd..a938aa6b7e6e5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -308,7 +308,7 @@ describe('actions_connectors_list', () => {
.at(4)
.find('div[data-test-subj="compatibility-content"]')
.text()
- ).toBe('Alerting RulesCases');
+ ).toBe('Alerting RulesCasesSecurity Solution');
expect(
wrapper
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx
index 6814fa11ddcae..808c9f8b1bae4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx
@@ -24,6 +24,7 @@ import { ClosablePopoverTitle } from './components';
import { IErrorObject } from '../../types';
export interface ForLastExpressionProps {
+ description?: string;
timeWindowSize?: number;
timeWindowUnit?: string;
errors: IErrorObject;
@@ -45,6 +46,12 @@ export interface ForLastExpressionProps {
display?: 'fullWidth' | 'inline';
}
+const FOR_LAST_LABEL = i18n.translate(
+ 'xpack.triggersActionsUI.common.expressionItems.forTheLast.descriptionLabel',
+ {
+ defaultMessage: 'for the last',
+ }
+);
export const ForLastExpression = ({
timeWindowSize,
timeWindowUnit = 's',
@@ -53,6 +60,7 @@ export const ForLastExpression = ({
onChangeWindowSize,
onChangeWindowUnit,
popupPosition,
+ description = FOR_LAST_LABEL,
}: ForLastExpressionProps) => {
const [alertDurationPopoverOpen, setAlertDurationPopoverOpen] = useState(false);
@@ -60,12 +68,7 @@ export const ForLastExpression = ({
0}
+ isInvalid={Number(errors.timeWindowSize?.length) > 0}
error={errors.timeWindowSize as string[]}
>
0}
+ isInvalid={Number(errors.timeWindowSize?.length) > 0}
min={0}
value={timeWindowSize || ''}
onChange={(e) => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.tsx
index 63c516dfea57e..5080b902c7775 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import React, { useState } from 'react';
+import React, { ReactNode, useState } from 'react';
import {
EuiExpression,
EuiPopover,
@@ -20,6 +20,7 @@ import { IErrorObject } from '../../types';
export interface ValueExpressionProps {
description: string;
value: number;
+ valueLabel?: string | ReactNode;
onChangeSelectedValue: (updatedValue: number) => void;
popupPosition?:
| 'upCenter'
@@ -41,6 +42,7 @@ export interface ValueExpressionProps {
export const ValueExpression = ({
description,
value,
+ valueLabel,
onChangeSelectedValue,
display = 'inline',
popupPosition,
@@ -53,7 +55,7 @@ export const ValueExpression = ({
{
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 1faadc6041634..943135565428f 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -354,6 +354,10 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
'--xpack.task_manager.allow_reading_invalid_state=false',
'--xpack.actions.queued.max=500',
`--xpack.stack_connectors.enableExperimental=${JSON.stringify(experimentalFeatures)}`,
+ '--xpack.uptime.service.password=test',
+ '--xpack.uptime.service.username=localKibanaIntegrationTestsUser',
+ '--xpack.uptime.service.devUrl=mockDevUrl',
+ '--xpack.uptime.service.manifestUrl=mockDevUrl',
],
},
};
diff --git a/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts b/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts
index 1a66aa2fcd9ed..c4ec1a9180541 100644
--- a/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts
+++ b/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts
@@ -7,6 +7,7 @@
import type { Client } from '@elastic/elasticsearch';
import type { Agent as SuperTestAgent } from 'supertest';
+import expect from '@kbn/expect';
import { ToolingLog } from '@kbn/tooling-log';
import { ThresholdParams } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
import { refreshSavedObjectIndices } from './refresh_index';
@@ -62,7 +63,7 @@ export async function createRule({
logger: ToolingLog;
esClient: Client;
}) {
- const { body } = await supertest
+ const { body, status } = await supertest
.post(`/api/alerting/rule`)
.set('kbn-xsrf', 'foo')
.send({
@@ -75,8 +76,9 @@ export async function createRule({
name,
rule_type_id: ruleTypeId,
actions,
- })
- .expect(200);
+ });
+
+ expect(status).to.eql(200, JSON.stringify(body));
await refreshSavedObjectIndices(esClient);
logger.debug(`Created rule id: ${body.id}`);
diff --git a/x-pack/test/alerting_api_integration/observability/helpers/alerting_wait_for_helpers.ts b/x-pack/test/alerting_api_integration/observability/helpers/alerting_wait_for_helpers.ts
index 17f45b8129d91..edc5ca8d35a60 100644
--- a/x-pack/test/alerting_api_integration/observability/helpers/alerting_wait_for_helpers.ts
+++ b/x-pack/test/alerting_api_integration/observability/helpers/alerting_wait_for_helpers.ts
@@ -14,6 +14,7 @@ import type {
SearchResponse,
} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import type { RetryService } from '@kbn/ftr-common-functional-services';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
import { retry } from '../../common/retry';
const TIMEOUT = 70_000;
@@ -63,6 +64,7 @@ export async function waitForDocumentInIndex({
timeout = TIMEOUT,
retries = RETRIES,
retryDelay = RETRY_DELAY,
+ filters,
}: {
esClient: Client;
indexName: string;
@@ -72,6 +74,7 @@ export async function waitForDocumentInIndex({
timeout?: number;
retries?: number;
retryDelay?: number;
+ filters?: QueryDslQueryContainer[];
}): Promise>> {
return await retry>>({
testFn: async () => {
@@ -79,6 +82,15 @@ export async function waitForDocumentInIndex({
index: indexName,
rest_total_hits_as_int: true,
ignore_unavailable: true,
+ body: filters
+ ? {
+ query: {
+ bool: {
+ filter: filters,
+ },
+ },
+ }
+ : undefined,
});
if (!response.hits.total || (response.hits.total as number) < docCountTarget) {
logger.debug(`Document count is ${response.hits.total}, should be ${docCountTarget}`);
@@ -104,12 +116,16 @@ export async function waitForAlertInIndex({
ruleId,
retryService,
logger,
+ filters = [],
+ retryDelay,
}: {
esClient: Client;
indexName: string;
ruleId: string;
retryService: RetryService;
logger: ToolingLog;
+ filters?: QueryDslQueryContainer[];
+ retryDelay?: number;
}): Promise>> {
return await retry>>({
testFn: async () => {
@@ -117,14 +133,21 @@ export async function waitForAlertInIndex({
index: indexName,
body: {
query: {
- term: {
- 'kibana.alert.rule.uuid': ruleId,
+ bool: {
+ filter: [
+ {
+ term: {
+ 'kibana.alert.rule.uuid': ruleId,
+ },
+ },
+ ...filters,
+ ],
},
},
},
});
if (response.hits.hits.length === 0) {
- throw new Error('No hits found');
+ throw new Error(`No hits found for the ruleId: ${ruleId}`);
}
return response;
},
@@ -133,6 +156,6 @@ export async function waitForAlertInIndex({
retryService,
timeout: TIMEOUT,
retries: RETRIES,
- retryDelay: RETRY_DELAY,
+ retryDelay: retryDelay ?? RETRY_DELAY,
});
}
diff --git a/x-pack/test/alerting_api_integration/observability/index.ts b/x-pack/test/alerting_api_integration/observability/index.ts
index 812123dd96b13..547c05a46bfcd 100644
--- a/x-pack/test/alerting_api_integration/observability/index.ts
+++ b/x-pack/test/alerting_api_integration/observability/index.ts
@@ -21,7 +21,8 @@ export default function ({ loadTestFile }: any) {
loadTestFile(require.resolve('./custom_threshold_rule_data_view'));
});
describe('Synthetics', () => {
- loadTestFile(require.resolve('./synthetics_rule'));
+ loadTestFile(require.resolve('./synthetics/synthetics_default_rule'));
+ loadTestFile(require.resolve('./synthetics/custom_status_rule'));
});
});
}
diff --git a/x-pack/test/alerting_api_integration/observability/synthetics/custom_status_rule.ts b/x-pack/test/alerting_api_integration/observability/synthetics/custom_status_rule.ts
new file mode 100644
index 0000000000000..6600054e03ab9
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/observability/synthetics/custom_status_rule.ts
@@ -0,0 +1,1000 @@
+/*
+ * 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 expect from '@kbn/expect';
+import moment from 'moment';
+import { SYNTHETICS_API_URLS } from '@kbn/synthetics-plugin/common/constants';
+import { StatusRuleParams } from '@kbn/synthetics-plugin/common/rules/status_rule';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { SyntheticsRuleHelper, SYNTHETICS_ALERT_ACTION_INDEX } from './synthetics_rule_helper';
+import { waitForDocumentInIndex } from '../helpers/alerting_wait_for_helpers';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService }: FtrProviderContext) {
+ const server = getService('kibanaServer');
+ const retryService = getService('retry');
+ const ruleHelper = new SyntheticsRuleHelper(getService);
+ const logger = getService('log');
+ const esClient = getService('es');
+ const esDeleteAllIndices = getService('esDeleteAllIndices');
+ const supertest = getService('supertest');
+
+ describe('SyntheticsCustomStatusRule', () => {
+ const SYNTHETICS_RULE_ALERT_INDEX = '.alerts-observability.uptime.alerts-default';
+
+ before(async () => {
+ await server.savedObjects.cleanStandardList();
+ await esDeleteAllIndices([SYNTHETICS_ALERT_ACTION_INDEX]);
+ await ruleHelper.createIndexAction();
+ await supertest
+ .put(SYNTHETICS_API_URLS.SYNTHETICS_ENABLEMENT)
+ .set('kbn-xsrf', 'true')
+ .expect(200);
+ });
+
+ after(async () => {
+ await server.savedObjects.cleanStandardList();
+ await esDeleteAllIndices([SYNTHETICS_ALERT_ACTION_INDEX]);
+ await esClient.deleteByQuery({
+ index: SYNTHETICS_RULE_ALERT_INDEX,
+ query: { match_all: {} },
+ });
+ });
+
+ /* 1. create a monitor
+ 2. create a custom rule
+ 3. create a down check scenario
+ 4. verify alert
+ 5. create an up check scenario
+ 6. verify recovered alert
+ when verifying recovered alert check:
+ - reason
+ - recoveryReason
+ - recoveryStatus
+ - locationNames
+ - link message
+ - locationId
+ when down recovered alert check
+ - reason
+ - locationNames
+ - link message
+ - locationId
+ */
+
+ describe('NumberOfChecks - location threshold = 1 - grouped by location - 1 location down', () => {
+ let ruleId = '';
+ let monitor: any;
+ let docs: any[] = [];
+
+ it('creates a monitor', async () => {
+ monitor = await ruleHelper.addMonitor('Monitor check based at ' + moment().format('LLL'));
+ expect(monitor).to.have.property('id');
+
+ docs = await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 5,
+ });
+ });
+
+ it('creates a custom rule', async () => {
+ const params = {
+ condition: {
+ locationsThreshold: 1,
+ window: {
+ numberOfChecks: 5,
+ },
+ groupBy: 'locationId',
+ downThreshold: 5,
+ },
+ monitorIds: [monitor.id],
+ };
+ const rule = await ruleHelper.createCustomStatusRule({
+ params,
+ name: 'When down 5 times from 1 location',
+ });
+ ruleId = rule.id;
+ expect(rule.params).to.eql(params);
+ });
+
+ it('should trigger down alert', async function () {
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ });
+
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" from Dev Service is down. Monitor is down 5 times within the last 5 checks. Alert when 5 out of the last 5 checks are down from at least 1 location.`
+ );
+ const downResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ expect(downResponse.hits.hits[0]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service is down. Monitor is down 5 times within the last 5 checks. Alert when 5 out of the last 5 checks are down from at least 1 location.`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationNames', 'Dev Service');
+ expect(downResponse.hits.hits[0]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationId', 'dev');
+ });
+
+ it('should trigger recovered alert', async function () {
+ docs = await ruleHelper.makeSummaries({
+ monitor,
+ upChecks: 1,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [{ term: { 'kibana.alert.status': 'recovered' } }],
+ });
+
+ const alert = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'recovered');
+ const recoveredResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ docCountTarget: 2,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ expect(recoveredResponse.hits.hits[1]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service is recovered. Alert when 5 out of the last 5 checks are down from at least 1 location.`
+ );
+ expect(recoveredResponse.hits.hits[1]._source).property('locationNames', 'Dev Service');
+ expect(recoveredResponse.hits.hits[1]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(recoveredResponse.hits.hits[1]._source).property('locationId', 'dev');
+ expect(recoveredResponse.hits.hits[1]._source).property(
+ 'recoveryReason',
+ `the monitor is now up again. It ran successfully at ${moment(docs[0]['@timestamp'])
+ .tz('UTC')
+ .format('MMM D, YYYY @ HH:mm:ss.SSS')}`
+ );
+ expect(recoveredResponse.hits.hits[1]._source).property('recoveryStatus', 'is now up');
+ });
+ });
+
+ describe('NumberOfChecks - Location threshold = 1 - grouped by location - 2 down locations', () => {
+ let ruleId = '';
+ let monitor: any;
+
+ it('creates a monitor', async () => {
+ monitor = await ruleHelper.addMonitor('Monitor location based at ' + moment().format('LT'));
+ expect(monitor).to.have.property('id');
+ });
+
+ it('creates a custom rule with 1 location threshold grouped by location', async () => {
+ const params: StatusRuleParams = {
+ condition: {
+ window: {
+ numberOfChecks: 1,
+ },
+ groupBy: 'locationId',
+ locationsThreshold: 1,
+ downThreshold: 1,
+ },
+ monitorIds: [monitor.id],
+ };
+
+ const rule = await ruleHelper.createCustomStatusRule({
+ params,
+ });
+ ruleId = rule.id;
+ expect(rule.params).to.eql(params);
+
+ await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 1,
+ location: {
+ id: 'dev2',
+ label: 'Dev Service 2',
+ },
+ });
+ const downDocs = await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 1,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'active' } },
+ { term: { 'monitor.id': monitor.id } },
+ { range: { '@timestamp': { gte: downDocs[0]['@timestamp'] } } },
+ ],
+ });
+
+ response.hits.hits.forEach((hit: any) => {
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" from ${alert['location.name']} is down. Monitor is down 1 time within the last 1 checks. Alert when 1 out of the last 1 checks are down from at least 1 location.`
+ );
+ });
+
+ const downResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ locationNames: string;
+ locationId: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ docCountTarget: 2,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ const lastTwoHits = downResponse.hits.hits.slice(-2).map((hit) => hit._source);
+
+ lastTwoHits.forEach((hit) => {
+ expect(hit).property(
+ 'reason',
+ `Monitor "${monitor.name}" from ${hit?.locationNames} is down. Monitor is down 1 time within the last 1 checks. Alert when 1 out of the last 1 checks are down from at least 1 location.`
+ );
+ expect(hit).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=${hit?.locationId}`
+ );
+ });
+ });
+ });
+
+ describe('NumberOfChecks - location threshold = 1 - ungrouped - 1 down location', () => {
+ let ruleId = '';
+ let monitor: any;
+ let docs: any[] = [];
+
+ it('creates a monitor', async () => {
+ monitor = await ruleHelper.addMonitor(
+ `Monitor check based at ${moment().format('LLL')} ungrouped`
+ );
+ expect(monitor).to.have.property('id');
+ });
+
+ it('creates a custom rule with 1 location threshold ungrouped', async () => {
+ const params = {
+ condition: {
+ locationsThreshold: 1,
+ window: {
+ numberOfChecks: 5,
+ },
+ groupBy: 'none',
+ downThreshold: 5,
+ },
+ monitorIds: [monitor.id],
+ };
+ const rule = await ruleHelper.createCustomStatusRule({
+ params,
+ name: 'Status based on number of checks',
+ });
+ ruleId = rule.id;
+ expect(rule.params).to.eql(params);
+ });
+
+ it('should trigger down for ungrouped', async () => {
+ docs = await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 5,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'active' } },
+ { term: { 'monitor.id': monitor.id } },
+ { range: { '@timestamp': { gte: docs[0]['@timestamp'] } } },
+ ],
+ });
+
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" is down 5 times from Dev Service. Alert when down 5 times out of the last 5 checks from at least 1 location.`
+ );
+ const downResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ docCountTarget: 1,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ expect(downResponse.hits.hits[0]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" is down 5 times from Dev Service. Alert when down 5 times out of the last 5 checks from at least 1 location.`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationNames', 'Dev Service');
+ expect(downResponse.hits.hits[0]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationId', 'dev');
+ });
+
+ it('should trigger recovered alert', async () => {
+ const upDocs = await ruleHelper.makeSummaries({
+ monitor,
+ upChecks: 1,
+ });
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'recovered' } },
+ { term: { 'monitor.id': monitor.id } },
+ { range: { '@timestamp': { gte: upDocs[0]['@timestamp'] } } },
+ ],
+ });
+ expect(response.hits.hits?.[0]._source).property('kibana.alert.status', 'recovered');
+ const recoveredResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ docCountTarget: 2,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ expect(recoveredResponse.hits.hits[1]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service is recovered. Alert when 5 out of the last 5 checks are down from at least 1 location.`
+ );
+ expect(recoveredResponse.hits.hits[1]._source).property('locationNames', 'Dev Service');
+ expect(recoveredResponse.hits.hits[1]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(recoveredResponse.hits.hits[1]._source).property('locationId', 'dev');
+ expect(recoveredResponse.hits.hits[1]._source).property(
+ 'recoveryReason',
+ 'the alert condition is no longer met'
+ );
+ expect(recoveredResponse.hits.hits[1]._source).property('recoveryStatus', 'has recovered');
+ });
+ });
+
+ describe('NumberOfChecks - Location threshold > 1 - ungrouped - 2 down locations', () => {
+ let ruleId = '';
+ let monitor: any;
+
+ it('creates a monitor', async () => {
+ monitor = await ruleHelper.addMonitor(
+ `Monitor location based at ${moment().format('LT')} ungrouped 2 locations`
+ );
+ expect(monitor).to.have.property('id');
+ });
+
+ it('creates a custom rule with location threshold', async () => {
+ const params: StatusRuleParams = {
+ condition: {
+ locationsThreshold: 2,
+ window: {
+ numberOfChecks: 1,
+ },
+ groupBy: 'none',
+ downThreshold: 1,
+ },
+ monitorIds: [monitor.id],
+ };
+ const rule = await ruleHelper.createCustomStatusRule({
+ params,
+ name: 'When down from 2 locations',
+ });
+ ruleId = rule.id;
+ expect(rule.params).to.eql(params);
+ });
+
+ it('should not trigger down alert based on location threshold with one location down', async () => {
+ // first down check from dev 1
+ const docs = await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 1,
+ });
+ // ensure alert does not fire
+ try {
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'active' } },
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ {
+ range: {
+ '@timestamp': {
+ gte: docs[0]['@timestamp'],
+ },
+ },
+ },
+ ],
+ });
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" is down from 1 location (Dev Service). Alert when monitor is down from 1 location.`
+ );
+ throw new Error('Alert was triggered when condition should not be met');
+ } catch (e) {
+ if (e.message === 'Alert was triggered when condition should not be met') {
+ throw e;
+ }
+ }
+ });
+
+ it('should trigger down alert based on location threshold with two locations down', async () => {
+ // 1st down check from dev 2
+ await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 1,
+ location: {
+ id: 'dev2',
+ label: 'Dev Service 2',
+ },
+ });
+ // 2nd down check from dev 1
+ const downDocs = await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 1,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'active' } },
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ {
+ range: {
+ '@timestamp': {
+ gte: downDocs[0]['@timestamp'],
+ },
+ },
+ },
+ ],
+ });
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" is down 1 time from Dev Service and 1 time from Dev Service 2. Alert when down 1 time out of the last 1 checks from at least 2 locations.`
+ );
+ const downResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ expect(downResponse.hits.hits[0]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" is down 1 time from Dev Service and 1 time from Dev Service 2. Alert when down 1 time out of the last 1 checks from at least 2 locations.`
+ );
+ expect(downResponse.hits.hits[0]._source).property(
+ 'locationNames',
+ 'Dev Service and Dev Service 2'
+ );
+ expect(downResponse.hits.hits[0]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationId', 'dev and dev2');
+ });
+
+ it('should trigger recovered alert', async () => {
+ const docs = await ruleHelper.makeSummaries({
+ monitor,
+ upChecks: 1,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'recovered' } },
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ {
+ range: {
+ '@timestamp': {
+ gte: docs[0]['@timestamp'],
+ },
+ },
+ },
+ ],
+ });
+
+ const alert = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'recovered');
+ const recoveryResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ docCountTarget: 2,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ expect(recoveryResponse.hits.hits[1]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service and Dev Service 2 is recovered. Alert when 1 out of the last 1 checks are down from at least 2 locations.`
+ );
+ expect(recoveryResponse.hits.hits[1]._source).property(
+ 'locationNames',
+ 'Dev Service and Dev Service 2'
+ );
+ expect(recoveryResponse.hits.hits[1]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(recoveryResponse.hits.hits[1]._source).property('locationId', 'dev and dev2');
+ });
+
+ let downDocs: any[] = [];
+
+ it('should be down again', async () => {
+ downDocs = await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 1,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'active' } },
+ { term: { 'monitor.id': monitor.id } },
+ { range: { '@timestamp': { gte: downDocs[0]['@timestamp'] } } },
+ ],
+ });
+
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" is down 1 time from Dev Service and 1 time from Dev Service 2. Alert when down 1 time out of the last 1 checks from at least 2 locations.`
+ );
+ const downResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ docCountTarget: 3,
+ filters: [{ term: { 'monitor.id': monitor.id } }],
+ });
+ expect(downResponse.hits.hits[2]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" is down 1 time from Dev Service and 1 time from Dev Service 2. Alert when down 1 time out of the last 1 checks from at least 2 locations.`
+ );
+ expect(downResponse.hits.hits[2]._source).property(
+ 'locationNames',
+ 'Dev Service and Dev Service 2'
+ );
+ expect(downResponse.hits.hits[2]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(downResponse.hits.hits[2]._source).property('locationId', 'dev and dev2');
+ });
+
+ it('should trigger recovered alert when the location threshold is no longer met', async () => {
+ // 2nd down check from dev 1
+ const upDocs = await ruleHelper.makeSummaries({
+ monitor,
+ upChecks: 1,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'recovered' } },
+ { term: { 'monitor.id': monitor.id } },
+ { range: { '@timestamp': { gte: upDocs[0]['@timestamp'] } } },
+ ],
+ });
+ const alert = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'recovered');
+ const recoveryResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ docCountTarget: 4,
+ filters: [{ term: { 'monitor.id': monitor.id } }],
+ });
+ expect(recoveryResponse.hits.hits[3]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service and Dev Service 2 is recovered. Alert when 1 out of the last 1 checks are down from at least 2 locations.`
+ );
+ expect(recoveryResponse.hits.hits[3]._source).property(
+ 'locationNames',
+ 'Dev Service and Dev Service 2'
+ );
+ expect(recoveryResponse.hits.hits[3]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(recoveryResponse.hits.hits[3]._source).property('locationId', 'dev and dev2');
+ expect(recoveryResponse.hits.hits[3]._source).property(
+ 'recoveryReason',
+ 'the alert condition is no longer met'
+ );
+ expect(recoveryResponse.hits.hits[3]._source).property('recoveryStatus', 'has recovered');
+ });
+ });
+
+ describe('TimeWindow - Location threshold = 1 - grouped by location - 1 down location', () => {
+ let ruleId = '';
+ let monitor: any;
+
+ it('creates a monitor', async () => {
+ monitor = await ruleHelper.addMonitor('Monitor time based at ' + moment().format('LT'));
+ expect(monitor).to.have.property('id');
+ });
+
+ it('creates a custom rule with time based window', async () => {
+ const params: StatusRuleParams = {
+ condition: {
+ locationsThreshold: 1,
+ window: {
+ time: {
+ unit: 'm',
+ size: 5,
+ },
+ },
+ groupBy: 'locationId',
+ downThreshold: 5,
+ },
+ monitorIds: [monitor.id],
+ };
+ const rule = await ruleHelper.createCustomStatusRule({
+ params,
+ name: 'Status based on checks in a time window',
+ });
+ expect(rule).to.have.property('id');
+ ruleId = rule.id;
+ expect(rule.params).to.eql(params);
+ });
+
+ it('should trigger down alert', async function () {
+ await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 5,
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [{ term: { 'monitor.id': monitor.id } }],
+ });
+
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" from Dev Service is down. Alert when 5 checks are down within the last 5 minutes from at least 1 location.`
+ );
+ const downResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+ expect(downResponse.hits.hits[0]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service is down. Alert when 5 checks are down within the last 5 minutes from at least 1 location.`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationNames', 'Dev Service');
+ expect(downResponse.hits.hits[0]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationId', 'dev');
+ });
+
+ it('should trigger recovered alert', async function () {
+ // wait 1 minute for at least 1 down check to fall out of the time window
+ await new Promise((resolve) => setTimeout(resolve, 30_000));
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'recovered' } },
+ { term: { 'monitor.id': monitor.id } },
+ ],
+ });
+
+ const alert = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'recovered');
+ const recoveryResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ docCountTarget: 2,
+ });
+ expect(recoveryResponse.hits.hits[1]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service is recovered. Alert when 5 checks are down within the last 5 minutes from at least 1 location.`
+ );
+ expect(recoveryResponse.hits.hits[1]._source).property(
+ 'recoveryReason',
+ 'the alert condition is no longer met'
+ );
+ expect(recoveryResponse.hits.hits[1]._source).property('recoveryStatus', 'has recovered');
+ expect(recoveryResponse.hits.hits[1]._source).property('locationNames', 'Dev Service');
+ expect(recoveryResponse.hits.hits[1]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(recoveryResponse.hits.hits[1]._source).property('locationId', 'dev');
+ });
+ });
+
+ describe('TimeWindow - Location threshold = 1 - grouped by location - 2 down location', () => {
+ let ruleId = '';
+ let monitor: any;
+
+ it('creates a monitor', async () => {
+ monitor = await ruleHelper.addMonitor(
+ `Monitor time based at ${moment().format('LT')} grouped 2 locations`
+ );
+ expect(monitor).to.have.property('id');
+ });
+
+ it('creates a custom rule with time based window', async () => {
+ const params: StatusRuleParams = {
+ condition: {
+ window: {
+ time: {
+ unit: 'm',
+ size: 5,
+ },
+ },
+ groupBy: 'locationId',
+ locationsThreshold: 2,
+ downThreshold: 5,
+ },
+ monitorIds: [monitor.id],
+ };
+ const rule = await ruleHelper.createCustomStatusRule({
+ params,
+ name: 'Status based on checks in a time window when down from 2 locations',
+ });
+ expect(rule).to.have.property('id');
+ ruleId = rule.id;
+ expect(rule.params).to.eql(params);
+ });
+
+ it('should trigger down alert', async function () {
+ // Generate data for 2 locations
+ await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 5,
+ location: monitor.locations[0],
+ });
+ await ruleHelper.makeSummaries({
+ monitor,
+ downChecks: 5,
+ location: monitor.locations[1],
+ });
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [{ term: { 'monitor.id': monitor.id } }],
+ });
+
+ const alert: any = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'active');
+ expect(alert['kibana.alert.reason']).to.eql(
+ `Monitor "${monitor.name}" is down 5 times from Dev Service and 5 times from Dev Service 2. Alert when down 5 times within the last 5 minutes from at least 2 locations.`
+ );
+ const downResponse = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ });
+
+ expect(downResponse.hits.hits[0]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" is down 5 times from Dev Service and 5 times from Dev Service 2. Alert when down 5 times within the last 5 minutes from at least 2 locations.`
+ );
+ expect(downResponse.hits.hits[0]._source).property(
+ 'locationNames',
+ 'Dev Service and Dev Service 2'
+ );
+ expect(downResponse.hits.hits[0]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(downResponse.hits.hits[0]._source).property('locationId', 'dev and dev2');
+ });
+
+ it('should trigger alert action', async function () {
+ const alertAction = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ docCountTarget: 1,
+ });
+
+ expect(alertAction.hits.hits[0]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" is down 5 times from Dev Service and 5 times from Dev Service 2. Alert when down 5 times within the last 5 minutes from at least 2 locations.`
+ );
+ expect(alertAction.hits.hits[0]._source).property(
+ 'locationNames',
+ 'Dev Service and Dev Service 2'
+ );
+ expect(alertAction.hits.hits[0]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(alertAction.hits.hits[0]._source).property('locationId', 'dev and dev2');
+ });
+
+ it('should trigger recovered alert', async function () {
+ // wait 30 secs for at least 1 down check to fall out of the time window
+ await new Promise((resolve) => setTimeout(resolve, 30_000));
+
+ const response = await ruleHelper.waitForStatusAlert({
+ ruleId,
+ filters: [
+ { term: { 'kibana.alert.status': 'recovered' } },
+ { term: { 'monitor.id': monitor.id } },
+ ],
+ });
+
+ const alert = response.hits.hits?.[0]._source;
+ expect(alert).to.have.property('kibana.alert.status', 'recovered');
+ const recoveryAction = await waitForDocumentInIndex<{
+ ruleType: string;
+ alertDetailsUrl: string;
+ reason: string;
+ }>({
+ esClient,
+ indexName: SYNTHETICS_ALERT_ACTION_INDEX,
+ retryService,
+ logger,
+ filters: [
+ {
+ term: { 'monitor.id': monitor.id },
+ },
+ ],
+ docCountTarget: 2,
+ });
+
+ expect(recoveryAction.hits.hits[1]._source).property(
+ 'reason',
+ `Monitor "${monitor.name}" from Dev Service and Dev Service 2 is recovered. Alert when 5 checks are down within the last 5 minutes from at least 2 locations.`
+ );
+ expect(recoveryAction.hits.hits[1]._source).property(
+ 'recoveryReason',
+ 'the alert condition is no longer met'
+ );
+ expect(recoveryAction.hits.hits[1]._source).property('recoveryStatus', 'has recovered');
+ expect(recoveryAction.hits.hits[1]._source).property(
+ 'locationNames',
+ 'Dev Service and Dev Service 2'
+ );
+ expect(recoveryAction.hits.hits[1]._source).property(
+ 'linkMessage',
+ `- Link: https://localhost:5601/app/synthetics/monitor/${monitor.id}/errors/Test%20private%20location-18524a3d9a7-0?locationId=dev`
+ );
+ expect(recoveryAction.hits.hits[1]._source).property('locationId', 'dev and dev2');
+ });
+ });
+
+ // TimeWindow - Location threshold = 1 - ungrouped - 1 down location
+
+ // TimeWindow - Location threshold > 1 - ungrouped - 2 down locations
+ });
+}
diff --git a/x-pack/test/alerting_api_integration/observability/synthetics_rule.ts b/x-pack/test/alerting_api_integration/observability/synthetics/data.ts
similarity index 59%
rename from x-pack/test/alerting_api_integration/observability/synthetics_rule.ts
rename to x-pack/test/alerting_api_integration/observability/synthetics/data.ts
index 864d73a991e50..566bb410d6321 100644
--- a/x-pack/test/alerting_api_integration/observability/synthetics_rule.ts
+++ b/x-pack/test/alerting_api_integration/observability/synthetics/data.ts
@@ -5,132 +5,13 @@
* 2.0.
*/
-import expect from '@kbn/expect';
-import { SYNTHETICS_API_URLS } from '@kbn/synthetics-plugin/common/constants';
-import { SanitizedRule } from '@kbn/alerting-plugin/common';
-import { omit } from 'lodash';
-import { TlsTranslations } from '@kbn/synthetics-plugin/common/rules/synthetics/translations';
-import { FtrProviderContext } from '../common/ftr_provider_context';
+import {
+ SyntheticsMonitorStatusTranslations,
+ TlsTranslations,
+} from '@kbn/synthetics-plugin/common/rules/synthetics/translations';
+import { SanitizedRule } from '@kbn/alerting-types';
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
- const server = getService('kibanaServer');
-
- const testActions = [
- 'custom.ssl.noCustom',
- 'notification-email',
- 'preconfigured-es-index-action',
- 'my-deprecated-servicenow',
- 'my-slack1',
- ];
-
- describe('SyntheticsRules', () => {
- before(async () => {
- await server.savedObjects.cleanStandardList();
- });
-
- after(async () => {
- await server.savedObjects.cleanStandardList();
- });
-
- it('creates rule when settings are configured', async () => {
- await supertest
- .put(SYNTHETICS_API_URLS.DYNAMIC_SETTINGS)
- .set('kbn-xsrf', 'true')
- .send({
- certExpirationThreshold: 30,
- certAgeThreshold: 730,
- defaultConnectors: testActions.slice(0, 2),
- defaultEmail: { to: ['test@gmail.com'], cc: [], bcc: [] },
- })
- .expect(200);
-
- const response = await supertest
- .post(SYNTHETICS_API_URLS.ENABLE_DEFAULT_ALERTING)
- .set('kbn-xsrf', 'true')
- .send();
- const statusResult = response.body.statusRule;
- const tlsResult = response.body.tlsRule;
- expect(statusResult.actions.length).eql(4);
- expect(tlsResult.actions.length).eql(4);
-
- compareRules(statusResult, statusRule);
- compareRules(tlsResult, tlsRule);
-
- testActions.slice(0, 2).forEach((action) => {
- const { recoveredAction, firingAction } = getActionById(statusRule, action);
- const resultAction = getActionById(statusResult, action);
- expect(firingAction).eql(resultAction.firingAction);
- expect(recoveredAction).eql(resultAction.recoveredAction);
- });
-
- testActions.slice(0, 2).forEach((action) => {
- const { recoveredAction, firingAction } = getActionById(tlsRule, action);
- const resultAction = getActionById(tlsResult, action);
- expect(firingAction).eql(resultAction.firingAction);
- expect(recoveredAction).eql(resultAction.recoveredAction);
- });
- });
-
- it('updates rules when settings are updated', async () => {
- await supertest
- .put(SYNTHETICS_API_URLS.DYNAMIC_SETTINGS)
- .set('kbn-xsrf', 'true')
- .send({
- certExpirationThreshold: 30,
- certAgeThreshold: 730,
- defaultConnectors: testActions,
- defaultEmail: { to: ['test@gmail.com'], cc: [], bcc: [] },
- })
- .expect(200);
-
- const response = await supertest
- .put(SYNTHETICS_API_URLS.ENABLE_DEFAULT_ALERTING)
- .set('kbn-xsrf', 'true')
- .send();
-
- const statusResult = response.body.statusRule;
- const tlsResult = response.body.tlsRule;
- expect(statusResult.actions.length).eql(9);
- expect(tlsResult.actions.length).eql(9);
-
- compareRules(statusResult, statusRule);
- compareRules(tlsResult, tlsRule);
-
- testActions.forEach((action) => {
- const { recoveredAction, firingAction } = getActionById(statusRule, action);
- const resultAction = getActionById(statusResult, action);
- expect(firingAction).eql(resultAction.firingAction);
- expect(recoveredAction).eql(resultAction.recoveredAction);
- });
- testActions.forEach((action) => {
- const { recoveredAction, firingAction } = getActionById(tlsRule, action);
- const resultAction = getActionById(tlsResult, action);
- expect(firingAction).eql(resultAction.firingAction);
- expect(recoveredAction).eql(resultAction.recoveredAction);
- });
- });
- });
-}
-const compareRules = (rule1: SanitizedRule, rule2: SanitizedRule) => {
- expect(rule1.alertTypeId).eql(rule2.alertTypeId);
- expect(rule1.schedule).eql(rule2.schedule);
-};
-
-const getActionById = (rule: SanitizedRule, id: string) => {
- const actions = rule.actions.filter((action) => action.id === id);
- const recoveredAction = actions.find(
- (action) => 'group' in action && action.group === 'recovered'
- );
- const firingAction = actions.find((action) => 'group' in action && action.group !== 'recovered');
- return {
- recoveredAction: omit(recoveredAction, ['uuid']),
- firingAction: omit(firingAction, ['uuid']),
- };
-};
-
-const statusRule = {
+export const statusRule = {
id: 'dbbc39f0-1781-11ee-80b9-6522650f1d50',
notifyWhen: null,
consumer: 'uptime',
@@ -152,7 +33,7 @@ const statusRule = {
{
group: 'recovered',
params: {
- body: 'The alert for "{{context.monitorName}}" from {{context.locationName}} is no longer active: {{context.recoveryReason}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- From: {{context.locationName}} \n- Last error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
+ body: SyntheticsMonitorStatusTranslations.defaultRecoveryMessage,
},
frequency: { notifyWhen: 'onActionGroupChange', throttle: null, summary: false },
uuid: '789f2b81-e098-4f33-9802-1d355f4fabbe',
@@ -162,7 +43,7 @@ const statusRule = {
{
group: 'xpack.synthetics.alerts.actionGroups.monitorStatus',
params: {
- body: '"{{context.monitorName}}" is {{{context.status}}} from {{context.locationName}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- Checked at: {{context.checkedAt}} \n- From: {{context.locationName}} \n- Error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
+ body: SyntheticsMonitorStatusTranslations.defaultActionMessage,
},
frequency: { notifyWhen: 'onActionGroupChange', throttle: null, summary: false },
uuid: '1b3f3958-f019-4ca0-b6b1-ccc4cf51d501',
@@ -173,10 +54,8 @@ const statusRule = {
group: 'recovered',
params: {
to: ['test@gmail.com'],
- subject:
- '"{{context.monitorName}}" ({{context.locationName}}) {{context.recoveryStatus}} - Elastic Synthetics',
- message:
- 'The alert for "{{context.monitorName}}" from {{context.locationName}} is no longer active: {{context.recoveryReason}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- From: {{context.locationName}} \n- Last error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
+ subject: SyntheticsMonitorStatusTranslations.defaultRecoverySubjectMessage,
+ message: SyntheticsMonitorStatusTranslations.defaultRecoveryMessage,
messageHTML: null,
cc: [],
bcc: [],
@@ -191,10 +70,8 @@ const statusRule = {
group: 'xpack.synthetics.alerts.actionGroups.monitorStatus',
params: {
to: ['test@gmail.com'],
- subject:
- '"{{context.monitorName}}" ({{context.locationName}}) is down - Elastic Synthetics',
- message:
- '"{{context.monitorName}}" is {{{context.status}}} from {{context.locationName}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- Checked at: {{context.checkedAt}} \n- From: {{context.locationName}} \n- Error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
+ subject: SyntheticsMonitorStatusTranslations.defaultSubjectMessage,
+ message: SyntheticsMonitorStatusTranslations.defaultActionMessage,
messageHTML: null,
cc: [],
bcc: [],
@@ -250,10 +127,8 @@ const statusRule = {
subAction: 'pushToService',
subActionParams: {
incident: {
- short_description:
- '"{{context.monitorName}}" is {{{context.status}}} from {{context.locationName}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- Checked at: {{context.checkedAt}} \n- From: {{context.locationName}} \n- Error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
- description:
- '"{{context.monitorName}}" is {{{context.status}}} from {{context.locationName}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- Checked at: {{context.checkedAt}} \n- From: {{context.locationName}} \n- Error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
+ short_description: SyntheticsMonitorStatusTranslations.defaultActionMessage,
+ description: SyntheticsMonitorStatusTranslations.defaultActionMessage,
impact: '2',
severity: '2',
urgency: '2',
@@ -275,8 +150,7 @@ const statusRule = {
{
group: 'recovered',
params: {
- message:
- 'The alert for "{{context.monitorName}}" from {{context.locationName}} is no longer active: {{context.recoveryReason}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- From: {{context.locationName}} \n- Last error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
+ message: SyntheticsMonitorStatusTranslations.defaultRecoveryMessage,
},
frequency: { notifyWhen: 'onActionGroupChange', throttle: null, summary: false },
uuid: '2d73f370-a90c-4347-8480-753cbeae719f',
@@ -286,8 +160,7 @@ const statusRule = {
{
group: 'xpack.synthetics.alerts.actionGroups.monitorStatus',
params: {
- message:
- '"{{context.monitorName}}" is {{{context.status}}} from {{context.locationName}}. - Elastic Synthetics\n\nDetails:\n\n- Monitor name: {{context.monitorName}} \n- {{context.monitorUrlLabel}}: {{{context.monitorUrl}}} \n- Monitor type: {{context.monitorType}} \n- Checked at: {{context.checkedAt}} \n- From: {{context.locationName}} \n- Error received: {{{context.lastErrorMessage}}} \n{{{context.linkMessage}}}',
+ message: SyntheticsMonitorStatusTranslations.defaultActionMessage,
},
frequency: { notifyWhen: 'onActionGroupChange', throttle: null, summary: false },
uuid: '1c5d0dd1-c360-4e14-8e4f-f24aa5c640c6',
@@ -339,7 +212,8 @@ const statusRule = {
},
ruleTypeId: 'xpack.synthetics.alerts.monitorStatus',
} as unknown as SanitizedRule;
-const tlsRule = {
+
+export const tlsRule = {
id: 'dbbc12e0-1781-11ee-80b9-6522650f1d50',
notifyWhen: null,
consumer: 'uptime',
diff --git a/x-pack/test/alerting_api_integration/observability/synthetics/private_location_test_service.ts b/x-pack/test/alerting_api_integration/observability/synthetics/private_location_test_service.ts
new file mode 100644
index 0000000000000..e9ac7237dca52
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/observability/synthetics/private_location_test_service.ts
@@ -0,0 +1,83 @@
+/*
+ * 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 { v4 as uuidv4 } from 'uuid';
+import { privateLocationsSavedObjectName } from '@kbn/synthetics-plugin/common/saved_objects/private_locations';
+import { privateLocationsSavedObjectId } from '@kbn/synthetics-plugin/server/saved_objects/private_locations';
+import { SyntheticsPrivateLocations } from '@kbn/synthetics-plugin/common/runtime_types';
+import { Agent as SuperTestAgent } from 'supertest';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+
+export const INSTALLED_VERSION = '1.1.1';
+
+export class PrivateLocationTestService {
+ private supertest: SuperTestAgent;
+ private readonly getService: FtrProviderContext['getService'];
+
+ constructor(getService: FtrProviderContext['getService']) {
+ this.supertest = getService('supertest');
+ this.getService = getService;
+ }
+
+ async installSyntheticsPackage() {
+ await this.supertest.post('/api/fleet/setup').set('kbn-xsrf', 'true').send().expect(200);
+ const response = await this.supertest
+ .get(`/api/fleet/epm/packages/synthetics/${INSTALLED_VERSION}`)
+ .set('kbn-xsrf', 'true')
+ .expect(200);
+ if (response.body.item.status !== 'installed') {
+ await this.supertest
+ .post(`/api/fleet/epm/packages/synthetics/${INSTALLED_VERSION}`)
+ .set('kbn-xsrf', 'true')
+ .send({ force: true })
+ .expect(200);
+ }
+ }
+
+ async addTestPrivateLocation() {
+ const apiResponse = await this.addFleetPolicy(uuidv4());
+ const testPolicyId = apiResponse.body.item.id;
+ return (await this.setTestLocations([testPolicyId]))[0];
+ }
+
+ async addFleetPolicy(name: string) {
+ return this.supertest
+ .post('/api/fleet/agent_policies?sys_monitoring=true')
+ .set('kbn-xsrf', 'true')
+ .send({
+ name,
+ description: '',
+ namespace: 'default',
+ monitoring_enabled: [],
+ })
+ .expect(200);
+ }
+
+ async setTestLocations(testFleetPolicyIds: string[]) {
+ const server = this.getService('kibanaServer');
+
+ const locations: SyntheticsPrivateLocations = testFleetPolicyIds.map((id, index) => ({
+ label: 'Test private location ' + index,
+ agentPolicyId: id,
+ id,
+ geo: {
+ lat: 0,
+ lon: 0,
+ },
+ isServiceManaged: false,
+ }));
+
+ await server.savedObjects.create({
+ type: privateLocationsSavedObjectName,
+ id: privateLocationsSavedObjectId,
+ attributes: {
+ locations,
+ },
+ overwrite: true,
+ });
+ return locations;
+ }
+}
diff --git a/x-pack/test/alerting_api_integration/observability/synthetics/synthetics_default_rule.ts b/x-pack/test/alerting_api_integration/observability/synthetics/synthetics_default_rule.ts
new file mode 100644
index 0000000000000..39f36b71b52ee
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/observability/synthetics/synthetics_default_rule.ts
@@ -0,0 +1,131 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { SYNTHETICS_API_URLS } from '@kbn/synthetics-plugin/common/constants';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { omit } from 'lodash';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { statusRule, tlsRule } from './data';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+ const server = getService('kibanaServer');
+
+ const testActions = [
+ 'custom.ssl.noCustom',
+ 'notification-email',
+ 'preconfigured-es-index-action',
+ 'my-deprecated-servicenow',
+ 'my-slack1',
+ ];
+
+ describe('SyntheticsDefaultRules', () => {
+ before(async () => {
+ await server.savedObjects.cleanStandardList();
+ });
+
+ after(async () => {
+ await server.savedObjects.cleanStandardList();
+ });
+
+ it('creates rule when settings are configured', async () => {
+ await supertest
+ .put(SYNTHETICS_API_URLS.DYNAMIC_SETTINGS)
+ .set('kbn-xsrf', 'true')
+ .send({
+ certExpirationThreshold: 30,
+ certAgeThreshold: 730,
+ defaultConnectors: testActions.slice(0, 2),
+ defaultEmail: { to: ['test@gmail.com'], cc: [], bcc: [] },
+ })
+ .expect(200);
+
+ const response = await supertest
+ .post(SYNTHETICS_API_URLS.ENABLE_DEFAULT_ALERTING)
+ .set('kbn-xsrf', 'true')
+ .send();
+ const statusResult = response.body.statusRule;
+ const tlsResult = response.body.tlsRule;
+ expect(statusResult.actions.length).eql(4);
+ expect(tlsResult.actions.length).eql(4);
+
+ compareRules(statusResult, statusRule);
+ compareRules(tlsResult, tlsRule);
+
+ testActions.slice(0, 2).forEach((action) => {
+ const { recoveredAction, firingAction } = getActionById(statusRule, action);
+ const resultAction = getActionById(statusResult, action);
+ expect(firingAction).eql(resultAction.firingAction);
+ expect(recoveredAction).eql(resultAction.recoveredAction);
+ });
+
+ testActions.slice(0, 2).forEach((action) => {
+ const { recoveredAction, firingAction } = getActionById(tlsRule, action);
+ const resultAction = getActionById(tlsResult, action);
+ expect(firingAction).eql(resultAction.firingAction);
+ expect(recoveredAction).eql(resultAction.recoveredAction);
+ });
+ });
+
+ it('updates rules when settings are updated', async () => {
+ await supertest
+ .put(SYNTHETICS_API_URLS.DYNAMIC_SETTINGS)
+ .set('kbn-xsrf', 'true')
+ .send({
+ certExpirationThreshold: 30,
+ certAgeThreshold: 730,
+ defaultConnectors: testActions,
+ defaultEmail: { to: ['test@gmail.com'], cc: [], bcc: [] },
+ })
+ .expect(200);
+
+ const response = await supertest
+ .put(SYNTHETICS_API_URLS.ENABLE_DEFAULT_ALERTING)
+ .set('kbn-xsrf', 'true')
+ .send();
+
+ const statusResult = response.body.statusRule;
+ const tlsResult = response.body.tlsRule;
+ expect(statusResult.actions.length).eql(9);
+ expect(tlsResult.actions.length).eql(9);
+
+ compareRules(statusResult, statusRule);
+ compareRules(tlsResult, tlsRule);
+
+ testActions.forEach((action) => {
+ const { recoveredAction, firingAction } = getActionById(statusRule, action);
+ const resultAction = getActionById(statusResult, action);
+ expect(firingAction).eql(resultAction.firingAction);
+ expect(recoveredAction).eql(resultAction.recoveredAction);
+ });
+ testActions.forEach((action) => {
+ const { recoveredAction, firingAction } = getActionById(tlsRule, action);
+ const resultAction = getActionById(tlsResult, action);
+ expect(firingAction).eql(resultAction.firingAction);
+ expect(recoveredAction).eql(resultAction.recoveredAction);
+ });
+ });
+ });
+}
+const compareRules = (rule1: SanitizedRule, rule2: SanitizedRule) => {
+ expect(rule1.alertTypeId).eql(rule2.alertTypeId);
+ expect(rule1.schedule).eql(rule2.schedule);
+};
+
+const getActionById = (rule: SanitizedRule, id: string) => {
+ const actions = rule.actions.filter((action) => action.id === id);
+ const recoveredAction = actions.find(
+ (action) => 'group' in action && action.group === 'recovered'
+ );
+ const firingAction = actions.find((action) => 'group' in action && action.group !== 'recovered');
+ return {
+ recoveredAction: omit(recoveredAction, ['uuid']),
+ firingAction: omit(firingAction, ['uuid']),
+ };
+};
diff --git a/x-pack/test/alerting_api_integration/observability/synthetics/synthetics_rule_helper.ts b/x-pack/test/alerting_api_integration/observability/synthetics/synthetics_rule_helper.ts
new file mode 100644
index 0000000000000..9321bc0935a80
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/observability/synthetics/synthetics_rule_helper.ts
@@ -0,0 +1,292 @@
+/*
+ * 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 { StatusRuleParams } from '@kbn/synthetics-plugin/common/rules/status_rule';
+import type { Client } from '@elastic/elasticsearch';
+import { ToolingLog } from '@kbn/tooling-log';
+import { makeDownSummary, makeUpSummary } from '@kbn/observability-synthetics-test-data';
+import { RetryService } from '@kbn/ftr-common-functional-services';
+import { EncryptedSyntheticsSavedMonitor } from '@kbn/synthetics-plugin/common/runtime_types';
+import moment from 'moment';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import { Agent as SuperTestAgent } from 'supertest';
+import { SYNTHETICS_API_URLS } from '@kbn/synthetics-plugin/common/constants';
+import expect from '@kbn/expect';
+import { waitForAlertInIndex } from '../helpers/alerting_wait_for_helpers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { PrivateLocationTestService } from './private_location_test_service';
+import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
+
+export const SYNTHETICS_ALERT_ACTION_INDEX = 'alert-action-synthetics';
+export class SyntheticsRuleHelper {
+ supertest: SuperTestAgent;
+ logger: ToolingLog;
+ esClient: Client;
+ retryService: RetryService;
+ locService: PrivateLocationTestService;
+ alertActionIndex: string;
+ actionId: string | null = null;
+
+ constructor(getService: FtrProviderContext['getService']) {
+ this.esClient = getService('es');
+ this.supertest = getService('supertest');
+ this.logger = getService('log');
+ this.retryService = getService('retry');
+ this.locService = new PrivateLocationTestService(getService);
+ this.alertActionIndex = SYNTHETICS_ALERT_ACTION_INDEX;
+ }
+
+ async createIndexAction() {
+ await this.esClient.indices.create({
+ index: this.alertActionIndex,
+ body: {
+ mappings: {
+ properties: {
+ 'monitor.id': {
+ type: 'keyword',
+ },
+ },
+ },
+ },
+ });
+ const actionId = await createIndexConnector({
+ supertest: this.supertest,
+ name: 'Index Connector: Synthetics API test',
+ indexName: this.alertActionIndex,
+ logger: this.logger,
+ });
+ this.actionId = actionId;
+ }
+
+ async createCustomStatusRule({
+ params,
+ name,
+ }: {
+ params: StatusRuleParams;
+ name?: string;
+ actions?: any[];
+ }) {
+ if (this.actionId === null) {
+ throw new Error('Index action not created. Call createIndexAction() first');
+ }
+ return await createRule({
+ params,
+ name: name ?? 'Custom status rule',
+ ruleTypeId: 'xpack.synthetics.alerts.monitorStatus',
+ consumer: 'alerts',
+ supertest: this.supertest,
+ esClient: this.esClient,
+ logger: this.logger,
+ schedule: { interval: '15s' },
+ actions: [
+ {
+ group: 'recovered',
+ id: this.actionId,
+ params: {
+ documents: [
+ {
+ status: 'recovered',
+ reason: '{{context.reason}}',
+ locationNames: '{{context.locationNames}}',
+ locationId: '{{context.locationId}}',
+ linkMessage: '{{context.linkMessage}}',
+ recoveryReason: '{{context.recoveryReason}}',
+ recoveryStatus: '{{context.recoveryStatus}}',
+ 'monitor.id': '{{context.monitorId}}',
+ },
+ ],
+ },
+ frequency: {
+ notify_when: 'onActionGroupChange',
+ throttle: null,
+ summary: false,
+ },
+ },
+ {
+ group: 'xpack.synthetics.alerts.actionGroups.monitorStatus',
+ id: this.actionId,
+ params: {
+ documents: [
+ {
+ status: 'active',
+ reason: '{{context.reason}}',
+ locationNames: '{{context.locationNames}}',
+ locationId: '{{context.locationId}}',
+ linkMessage: '{{context.linkMessage}}',
+ 'monitor.id': '{{context.monitorId}}',
+ },
+ ],
+ },
+ frequency: {
+ notify_when: 'onActionGroupChange',
+ throttle: null,
+ summary: false,
+ },
+ },
+ ],
+ });
+ }
+
+ async addMonitor(name: string) {
+ const testData = {
+ locations: [
+ { id: 'dev', isServiceManaged: true, label: 'Dev Service' },
+ { id: 'dev2', isServiceManaged: true, label: 'Dev Service 2' },
+ ],
+ name,
+ type: 'http',
+ url: 'http://www.google.com',
+ schedule: 1,
+ };
+ const res = await this.supertest
+ .post(SYNTHETICS_API_URLS.SYNTHETICS_MONITORS)
+ .set('kbn-xsrf', 'true')
+ .send(testData);
+
+ expect(res.status).to.eql(200, JSON.stringify(res.body));
+
+ return res.body as EncryptedSyntheticsSavedMonitor;
+ }
+
+ async deleteMonitor(monitorId: string) {
+ const res = await this.supertest
+ .delete(SYNTHETICS_API_URLS.SYNTHETICS_MONITORS + '/' + monitorId)
+ .set('kbn-xsrf', 'true')
+ .send();
+
+ expect(res.status).to.eql(200);
+ }
+
+ async updateTestMonitor(monitorId: string, updates: Record) {
+ const result = await this.supertest
+ .put(SYNTHETICS_API_URLS.SYNTHETICS_MONITORS + `/${monitorId}`)
+ .set('kbn-xsrf', 'true')
+ .send(updates);
+
+ expect(result.status).to.eql(200, JSON.stringify(result.body));
+
+ return result.body as EncryptedSyntheticsSavedMonitor;
+ }
+
+ async addPrivateLocation() {
+ await this.locService.installSyntheticsPackage();
+ return this.locService.addTestPrivateLocation();
+ }
+
+ async waitForStatusAlert({
+ ruleId,
+ filters,
+ }: {
+ ruleId: string;
+ filters?: QueryDslQueryContainer[];
+ }) {
+ return await waitForAlertInIndex({
+ ruleId,
+ filters,
+ esClient: this.esClient,
+ retryService: this.retryService,
+ logger: this.logger,
+ indexName: '.internal.alerts-observability.uptime.alerts-default*',
+ retryDelay: 1000,
+ });
+ }
+
+ async makeSummaries({
+ downChecks = 0,
+ upChecks = 0,
+ monitor,
+ location,
+ }: {
+ downChecks?: number;
+ upChecks?: number;
+ monitor: EncryptedSyntheticsSavedMonitor;
+ location?: {
+ id: string;
+ label: string;
+ };
+ }) {
+ const docs = [];
+ // lets make some down checks
+ for (let i = downChecks; i > 0; i--) {
+ const doc = await this.addSummaryDocument({
+ monitor,
+ location,
+ status: 'down',
+ timestamp: moment()
+ .subtract(i - 1, 'minutes')
+ .toISOString(),
+ });
+ docs.push(doc);
+ }
+
+ // lets make some up checks
+ for (let i = upChecks; i > 0; i--) {
+ const doc = await this.addSummaryDocument({
+ monitor,
+ location,
+ status: 'up',
+ timestamp: moment()
+ .subtract(i - 1, 'minutes')
+ .toISOString(),
+ });
+ docs.push(doc);
+ }
+ return docs;
+ }
+
+ async addSummaryDocument({
+ monitor,
+ location,
+ status = 'up',
+ timestamp = new Date(Date.now()).toISOString(),
+ }: {
+ monitor: EncryptedSyntheticsSavedMonitor;
+ status?: 'up' | 'down';
+ timestamp?: string;
+ location?: {
+ id: string;
+ label: string;
+ };
+ }) {
+ let document = {
+ '@timestamp': timestamp,
+ };
+
+ const index = 'synthetics-http-default';
+
+ const commonData = {
+ timestamp,
+ location,
+ monitorId: monitor.id,
+ name: monitor.name,
+ configId: monitor.config_id,
+ };
+
+ if (status === 'down') {
+ document = {
+ ...makeDownSummary(commonData),
+ ...document,
+ };
+ } else {
+ document = {
+ ...makeUpSummary(commonData),
+ ...document,
+ };
+ }
+
+ this.logger.debug(
+ `created synthetics summary, status: ${status}, monitor: "${monitor.name}", location: "${location?.label}"`
+ );
+ await this.esClient.index({
+ index,
+ document,
+ refresh: true,
+ });
+
+ return document;
+ }
+}
diff --git a/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts b/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts
index 9ab91cf0d60c0..51f98b5389a9d 100644
--- a/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts
+++ b/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts
@@ -29,6 +29,21 @@ export const deleteIndex = async (es: Client, indexToBeDeleted: string[]) => {
]);
};
+export const bulkIndex = async (es: Client, findingsMock: T[], indexName: string) => {
+ const operations = findingsMock.flatMap((finding) => [
+ { create: { _index: indexName } }, // Action description
+ {
+ ...finding,
+ '@timestamp': new Date().toISOString(),
+ }, // Data to index
+ ]);
+
+ await es.bulk({
+ body: operations, // Bulk API expects 'body' for operations
+ refresh: true,
+ });
+};
+
export const addIndex = async (es: Client, findingsMock: T[], indexName: string) => {
await Promise.all([
...findingsMock.map((finding) =>
diff --git a/x-pack/test/api_integration/apis/maps/maps_telemetry.ts b/x-pack/test/api_integration/apis/maps/maps_telemetry.ts
index acd846f77c982..3207fdbb739ef 100644
--- a/x-pack/test/api_integration/apis/maps/maps_telemetry.ts
+++ b/x-pack/test/api_integration/apis/maps/maps_telemetry.ts
@@ -36,8 +36,8 @@ export default function ({ getService }: FtrProviderContext) {
return fieldStat.name === 'geo_point';
}
);
- expect(geoPointFieldStats.count).to.be(47);
- expect(geoPointFieldStats.index_count).to.be(11);
+ expect(geoPointFieldStats.count).to.be(55);
+ expect(geoPointFieldStats.index_count).to.be(12);
const geoShapeFieldStats = apiResponse.cluster_stats.indices.mappings.field_types.find(
(fieldStat: estypes.ClusterStatsFieldTypes) => {
diff --git a/x-pack/test/api_integration/apis/slos/delete_slo.ts b/x-pack/test/api_integration/apis/slos/delete_slo.ts
index 19480d568a37c..979564f06be55 100644
--- a/x-pack/test/api_integration/apis/slos/delete_slo.ts
+++ b/x-pack/test/api_integration/apis/slos/delete_slo.ts
@@ -55,13 +55,15 @@ export default function ({ getService }: FtrProviderContext) {
const { id } = response.body;
- const savedObject = await kibanaServer.savedObjects.find({
- type: SO_SLO_TYPE,
- });
+ await retry.tryForTime(10000, async () => {
+ const savedObject = await kibanaServer.savedObjects.find({
+ type: SO_SLO_TYPE,
+ });
- expect(savedObject.saved_objects.length).eql(1);
+ expect(savedObject.saved_objects.length).eql(1);
- expect(savedObject.saved_objects[0].attributes.id).eql(id);
+ expect(savedObject.saved_objects[0].attributes.id).eql(id);
+ });
await retry.tryForTime(300 * 1000, async () => {
// expect summary and rollup data to exist
diff --git a/x-pack/test/api_integration/apis/slos/update_slo.ts b/x-pack/test/api_integration/apis/slos/update_slo.ts
index 7bf6967bd26a3..a8f4aa1a334f8 100644
--- a/x-pack/test/api_integration/apis/slos/update_slo.ts
+++ b/x-pack/test/api_integration/apis/slos/update_slo.ts
@@ -14,7 +14,7 @@ import { loadTestData } from './helper/load_test_data';
import { sloData } from './fixtures/create_slo';
export default function ({ getService }: FtrProviderContext) {
- describe('Update SLOs', function () {
+ describe('UpdateSLOs', function () {
this.tags('skipCloud');
const supertestAPI = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/synthetics/add_monitor_private_location.ts b/x-pack/test/api_integration/apis/synthetics/add_monitor_private_location.ts
index 044e66fe239f7..051ae14396687 100644
--- a/x-pack/test/api_integration/apis/synthetics/add_monitor_private_location.ts
+++ b/x-pack/test/api_integration/apis/synthetics/add_monitor_private_location.ts
@@ -10,7 +10,6 @@ import { v4 as uuidv4 } from 'uuid';
import {
ConfigKey,
HTTPFields,
- LocationStatus,
PrivateLocation,
ServiceLocation,
} from '@kbn/synthetics-plugin/common/runtime_types';
@@ -19,6 +18,7 @@ import { formatKibanaNamespace } from '@kbn/synthetics-plugin/common/formatters'
import { omit } from 'lodash';
import { PackagePolicy } from '@kbn/fleet-plugin/common';
import expect from '@kbn/expect';
+import { getDevLocation } from '@kbn/synthetics-plugin/server/synthetics_service/get_service_locations';
import { FtrProviderContext } from '../../ftr_provider_context';
import { getFixtureJson } from './helper/get_fixture_json';
import { comparePolicies, getTestSyntheticsPolicy } from './sample_data/test_policy';
@@ -79,15 +79,7 @@ export default function ({ getService }: FtrProviderContext) {
const apiResponse = await supertestAPI.get(SYNTHETICS_API_URLS.SERVICE_LOCATIONS);
const testResponse: Array = [
- {
- id: 'dev',
- label: 'Dev Service',
- geo: { lat: 0, lon: 0 },
- url: 'mockDevUrl',
- isServiceManaged: true,
- status: LocationStatus.EXPERIMENTAL,
- isInvalid: false,
- },
+ ...getDevLocation('mockDevUrl'),
{
id: testFleetPolicyID,
isServiceManaged: false,
diff --git a/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts b/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts
index bd6f94a44f6c1..9654a2bc43404 100644
--- a/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts
+++ b/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts
@@ -2036,7 +2036,7 @@ export default function ({ getService }: FtrProviderContext) {
failedMonitors: [
{
details:
- "Invalid locations specified. Elastic managed Location(s) 'does not exist' not found. Available locations are 'dev'",
+ "Invalid locations specified. Elastic managed Location(s) 'does not exist' not found. Available locations are 'dev|dev2'",
id: httpProjectMonitors.monitors[1].id,
payload: {
'check.request': {
diff --git a/x-pack/test/api_integration/apis/synthetics/add_monitor_public_api.ts b/x-pack/test/api_integration/apis/synthetics/add_monitor_public_api.ts
index 5da370d1c634f..082d1aebd6d76 100644
--- a/x-pack/test/api_integration/apis/synthetics/add_monitor_public_api.ts
+++ b/x-pack/test/api_integration/apis/synthetics/add_monitor_public_api.ts
@@ -44,7 +44,7 @@ export default function ({ getService }: FtrProviderContext) {
it('return error if invalid location specified', async () => {
const { message } = await addMonitorAPI({ type: 'http', locations: ['mars'] }, 400);
expect(message).eql(
- "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev'"
+ "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev|dev2'"
);
});
@@ -68,7 +68,7 @@ export default function ({ getService }: FtrProviderContext) {
400
);
expect(result.message).eql(
- "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev' Private Location(s) 'moon' not found. No private location available to use."
+ "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev|dev2' Private Location(s) 'moon' not found. No private location available to use."
);
});
diff --git a/x-pack/test/api_integration/apis/synthetics/edit_monitor_public_api.ts b/x-pack/test/api_integration/apis/synthetics/edit_monitor_public_api.ts
index fa7c780a2d971..e52d83ce9b263 100644
--- a/x-pack/test/api_integration/apis/synthetics/edit_monitor_public_api.ts
+++ b/x-pack/test/api_integration/apis/synthetics/edit_monitor_public_api.ts
@@ -115,7 +115,7 @@ export default function ({ getService }: FtrProviderContext) {
400
);
expect(message).eql(
- "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev'"
+ "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev|dev2'"
);
});
@@ -141,7 +141,7 @@ export default function ({ getService }: FtrProviderContext) {
400
);
expect(result.message).eql(
- "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev' Private Location(s) 'moon' not found. No private location available to use."
+ "Invalid locations specified. Elastic managed Location(s) 'mars' not found. Available locations are 'dev|dev2' Private Location(s) 'moon' not found. No private location available to use."
);
});
diff --git a/x-pack/test/api_integration/apis/synthetics/suggestions.ts b/x-pack/test/api_integration/apis/synthetics/suggestions.ts
index dab822f832c08..043c1c4da0ee6 100644
--- a/x-pack/test/api_integration/apis/synthetics/suggestions.ts
+++ b/x-pack/test/api_integration/apis/synthetics/suggestions.ts
@@ -154,13 +154,6 @@ export default function ({ getService }: FtrProviderContext) {
value: expect.any(String),
})),
]),
- projects: [
- {
- count: 2,
- label: project,
- value: project,
- },
- ],
monitorTypes: [
{
count: 20,
@@ -173,6 +166,13 @@ export default function ({ getService }: FtrProviderContext) {
value: 'icmp',
},
],
+ projects: [
+ {
+ count: 2,
+ label: project,
+ value: project,
+ },
+ ],
tags: expect.arrayContaining([
{
count: 21,
@@ -242,23 +242,18 @@ export default function ({ getService }: FtrProviderContext) {
value: expect.any(String),
}))
),
- projects: [
+ monitorTypes: [
{
count: 2,
- label: project,
- value: project,
+ label: 'icmp',
+ value: 'icmp',
},
],
- monitorTypes: [
- // {
- // count: 20,
- // label: 'http',
- // value: 'http',
- // },
+ projects: [
{
count: 2,
- label: 'icmp',
- value: 'icmp',
+ label: project,
+ value: project,
},
],
tags: expect.arrayContaining([
diff --git a/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts b/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts
index c262cc3c79bdc..8e0aaeff21580 100644
--- a/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts
+++ b/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts
@@ -82,6 +82,15 @@ export default function ({ getService }: FtrProviderContext) {
status: LocationStatus.EXPERIMENTAL,
isInvalid: false,
},
+ {
+ id: 'dev2',
+ label: 'Dev Service 2',
+ geo: { lat: 0, lon: 0 },
+ url: 'mockDevUrl',
+ isServiceManaged: true,
+ status: LocationStatus.EXPERIMENTAL,
+ isInvalid: false,
+ },
{
id: testFleetPolicyID,
isInvalid: false,
diff --git a/x-pack/test/cloud_security_posture_functional/agentless/create_agent.ts b/x-pack/test/cloud_security_posture_functional/agentless/create_agent.ts
index 1b1497140875e..2065d1307fbda 100644
--- a/x-pack/test/cloud_security_posture_functional/agentless/create_agent.ts
+++ b/x-pack/test/cloud_security_posture_functional/agentless/create_agent.ts
@@ -73,6 +73,62 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
);
});
+ it(`should show setup technology selector in edit mode`, async () => {
+ const integrationPolicyName = `cloud_security_posture-${new Date().toISOString()}`;
+ await cisIntegration.navigateToAddIntegrationCspmWithVersionPage(
+ CLOUD_CREDENTIALS_PACKAGE_VERSION
+ );
+
+ await cisIntegration.clickOptionButton(CIS_AWS_OPTION_TEST_ID);
+ await cisIntegration.clickOptionButton(AWS_SINGLE_ACCOUNT_TEST_ID);
+
+ await cisIntegration.inputIntegrationName(integrationPolicyName);
+
+ await cisIntegration.selectSetupTechnology('agentless');
+ await cisIntegration.selectAwsCredentials('direct');
+
+ await pageObjects.header.waitUntilLoadingHasFinished();
+
+ await cisIntegration.clickSaveButton();
+ await pageObjects.header.waitUntilLoadingHasFinished();
+
+ expect(await cisIntegrationAws.showPostInstallCloudFormationModal()).to.be(false);
+
+ await cisIntegration.navigateToIntegrationCspList();
+ await pageObjects.header.waitUntilLoadingHasFinished();
+
+ await cisIntegration.navigateToEditIntegrationPage();
+ await pageObjects.header.waitUntilLoadingHasFinished();
+
+ expect(await cisIntegration.showSetupTechnologyComponent()).to.be(true);
+ });
+
+ it(`should hide setup technology selector in edit mode`, async () => {
+ const integrationPolicyName = `cloud_security_posture1-${new Date().toISOString()}`;
+ await cisIntegration.navigateToAddIntegrationCspmWithVersionPage(
+ CLOUD_CREDENTIALS_PACKAGE_VERSION
+ );
+
+ await cisIntegration.clickOptionButton(CIS_AWS_OPTION_TEST_ID);
+ await cisIntegration.clickOptionButton(AWS_SINGLE_ACCOUNT_TEST_ID);
+
+ await cisIntegration.inputIntegrationName(integrationPolicyName);
+ await cisIntegration.selectSetupTechnology('agent-based');
+ await pageObjects.header.waitUntilLoadingHasFinished();
+
+ await cisIntegration.clickSaveButton();
+ await pageObjects.header.waitUntilLoadingHasFinished();
+
+ expect(await cisIntegrationAws.showPostInstallCloudFormationModal()).to.be(true);
+
+ await cisIntegration.navigateToIntegrationCspList();
+ await pageObjects.header.waitUntilLoadingHasFinished();
+ await cisIntegration.navigateToEditIntegrationPage();
+ await pageObjects.header.waitUntilLoadingHasFinished();
+
+ expect(await cisIntegration.showSetupTechnologyComponent()).to.be(false);
+ });
+
it(`should create default agent-based agent`, async () => {
const integrationPolicyName = `cloud_security_posture-${new Date().toISOString()}`;
diff --git a/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts b/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts
index 8732f0ba5b012..e3ef420055196 100644
--- a/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts
+++ b/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts
@@ -285,6 +285,11 @@ export function AddCisIntegrationFormPageProvider({
);
await agentOption.click();
};
+
+ const showSetupTechnologyComponent = async () => {
+ return await testSubjects.exists(SETUP_TECHNOLOGY_SELECTOR_ACCORDION_TEST_SUBJ);
+ };
+
const selectAwsCredentials = async (credentialType: 'direct' | 'temporary') => {
await clickOptionButton(AWS_CREDENTIAL_SELECTOR);
await selectValue(
@@ -544,5 +549,7 @@ export function AddCisIntegrationFormPageProvider({
getFirstCspmIntegrationPageAgent,
getAgentBasedPolicyValue,
showSuccessfulToast,
+ showSetupTechnologyComponent,
+ navigateToEditIntegrationPage,
};
}
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts
index ebe7a91019094..fddf71eaf98a1 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts
@@ -166,7 +166,7 @@ export default function (providerContext: FtrProviderContext) {
.set('kbn-xsrf', 'xxxx')
.expect(200);
- await supertest.get(`/api/fleet/agent_policies/${agentPolicy.id}`).expect(404);
+ await supertest.get(`/api/fleet/agent_policies/${agentPolicy.id}`).expect(200);
});
});
describe('Delete bulk', () => {
diff --git a/x-pack/test/functional/apps/lens/group4/index.ts b/x-pack/test/functional/apps/lens/group4/index.ts
index 51b3bac4c519f..61074d6aa6d78 100644
--- a/x-pack/test/functional/apps/lens/group4/index.ts
+++ b/x-pack/test/functional/apps/lens/group4/index.ts
@@ -82,5 +82,6 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
loadTestFile(require.resolve('./share')); // 1m 20s
// keep it last in the group
loadTestFile(require.resolve('./tsdb')); // 1m
+ loadTestFile(require.resolve('./logsdb')); // 1m
});
};
diff --git a/x-pack/test/functional/apps/lens/group4/logsdb.ts b/x-pack/test/functional/apps/lens/group4/logsdb.ts
new file mode 100644
index 0000000000000..a58b5c6bf806f
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group4/logsdb.ts
@@ -0,0 +1,586 @@
+/*
+ * 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 expect from '@kbn/expect';
+import moment from 'moment';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import {
+ type ScenarioIndexes,
+ getDataMapping,
+ getDocsGenerator,
+ setupScenarioRunner,
+ TIME_PICKER_FORMAT,
+} from './tsdb_logsdb_helpers';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const { common, lens, discover, header } = getPageObjects([
+ 'common',
+ 'lens',
+ 'discover',
+ 'header',
+ ]);
+ const testSubjects = getService('testSubjects');
+ const find = getService('find');
+ const kibanaServer = getService('kibanaServer');
+ const es = getService('es');
+ const log = getService('log');
+ const dataStreams = getService('dataStreams');
+ const indexPatterns = getService('indexPatterns');
+ const esArchiver = getService('esArchiver');
+ const monacoEditor = getService('monacoEditor');
+ const retry = getService('retry');
+
+ const createDocs = getDocsGenerator(log, es, 'logsdb');
+
+ describe('lens logsdb', function () {
+ const logsdbIndex = 'kibana_sample_data_logslogsdb';
+ const logsdbDataView = logsdbIndex;
+ const logsdbEsArchive = 'test/functional/fixtures/es_archiver/kibana_sample_data_logs_logsdb';
+ const fromTime = 'Apr 16, 2023 @ 00:00:00.000';
+ const toTime = 'Jun 16, 2023 @ 00:00:00.000';
+
+ before(async () => {
+ log.info(`loading ${logsdbIndex} index...`);
+ await esArchiver.loadIfNeeded(logsdbEsArchive);
+ log.info(`creating a data view for "${logsdbDataView}"...`);
+ await indexPatterns.create(
+ {
+ title: logsdbDataView,
+ timeFieldName: '@timestamp',
+ },
+ { override: true }
+ );
+ log.info(`updating settings to use the "${logsdbDataView}" dataView...`);
+ await kibanaServer.uiSettings.update({
+ 'dateFormat:tz': 'UTC',
+ defaultIndex: '0ae0bc7a-e4ca-405c-ab67-f2b5913f2a51',
+ 'timepicker:timeDefaults': `{ "from": "${fromTime}", "to": "${toTime}" }`,
+ });
+ });
+
+ after(async () => {
+ await kibanaServer.savedObjects.cleanStandardList();
+ await kibanaServer.uiSettings.replace({});
+ await es.indices.delete({ index: [logsdbIndex] });
+ });
+
+ describe('smoke testing functions support', () => {
+ before(async () => {
+ await common.navigateToApp('lens');
+ await lens.switchDataPanelIndexPattern(logsdbDataView);
+ await lens.goToTimeRange();
+ });
+
+ afterEach(async () => {
+ await lens.removeLayer();
+ });
+
+ // skip count for now as it's a special function and will
+ // change automatically the unsupported field to Records when detected
+ const allOperations = [
+ 'average',
+ 'max',
+ 'last_value',
+ 'median',
+ 'percentile',
+ 'percentile_rank',
+ 'standard_deviation',
+ 'sum',
+ 'unique_count',
+ 'min',
+ 'max',
+ 'counter_rate',
+ 'last_value',
+ ];
+
+ it(`should work with all operations`, async () => {
+ // start from a count() over a date histogram
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: '@timestamp',
+ });
+
+ // minimum supports all logsdb field types
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'count',
+ field: 'bytes',
+ keepOpen: true,
+ });
+
+ // now check that operations won't show the incompatibility tooltip
+ for (const operation of allOperations) {
+ expect(
+ testSubjects.exists(`lns-indexPatternDimension-${operation} incompatible`, {
+ timeout: 500,
+ })
+ ).to.eql(false);
+ }
+
+ for (const operation of allOperations) {
+ // try to change to the provided function and check all is ok
+ await lens.selectOperation(operation);
+
+ expect(
+ await find.existsByCssSelector(
+ '[data-test-subj="indexPattern-field-selection-row"] .euiFormErrorText'
+ )
+ ).to.be(false);
+ }
+ await lens.closeDimensionEditor();
+ });
+
+ describe('Scenarios with changing stream type', () => {
+ const getScenarios = (
+ initialIndex: string
+ ): Array<{
+ name: string;
+ indexes: ScenarioIndexes[];
+ }> => [
+ {
+ name: 'LogsDB stream with no additional stream/index',
+ indexes: [{ index: initialIndex }],
+ },
+ {
+ name: 'LogsDB stream with no additional stream/index and no host.name field',
+ indexes: [
+ {
+ index: `${initialIndex}_no_host`,
+ removeLogsDBFields: true,
+ create: true,
+ mode: 'logsdb',
+ },
+ ],
+ },
+ {
+ name: 'LogsDB stream with an additional regular index',
+ indexes: [{ index: initialIndex }, { index: 'regular_index', create: true }],
+ },
+ {
+ name: 'LogsDB stream with an additional LogsDB stream',
+ indexes: [
+ { index: initialIndex },
+ { index: 'logsdb_index_2', create: true, mode: 'logsdb' },
+ ],
+ },
+ {
+ name: 'LogsDB stream with an additional TSDB stream',
+ indexes: [{ index: initialIndex }, { index: 'tsdb_index', create: true, mode: 'tsdb' }],
+ },
+ {
+ name: 'LogsDB stream with an additional TSDB stream downsampled',
+ indexes: [
+ { index: initialIndex },
+ { index: 'tsdb_index_downsampled', create: true, mode: 'tsdb', downsample: true },
+ ],
+ },
+ ];
+
+ const { runTestsForEachScenario, toTimeForScenarios, fromTimeForScenarios } =
+ setupScenarioRunner(getService, getPageObjects, getScenarios);
+
+ describe('Data-stream upgraded to LogsDB scenarios', () => {
+ const streamIndex = 'data_stream';
+ // rollover does not allow to change name, it will just change backing index underneath
+ const streamConvertedToLogsDBIndex = streamIndex;
+
+ before(async () => {
+ log.info(`Creating "${streamIndex}" data stream...`);
+ await dataStreams.createDataStream(
+ streamIndex,
+ getDataMapping({ mode: 'logsdb' }),
+ undefined
+ );
+
+ // add some data to the stream
+ await createDocs(streamIndex, { isStream: true }, fromTimeForScenarios);
+
+ log.info(`Update settings for "${streamIndex}" dataView...`);
+ await kibanaServer.uiSettings.update({
+ 'dateFormat:tz': 'UTC',
+ 'timepicker:timeDefaults': '{ "from": "now-1y", "to": "now" }',
+ });
+ log.info(`Upgrade "${streamIndex}" stream to LogsDB...`);
+
+ const logsdbMapping = getDataMapping({ mode: 'logsdb' });
+ await dataStreams.upgradeStream(streamIndex, logsdbMapping, 'logsdb');
+ log.info(
+ `Add more data to new "${streamConvertedToLogsDBIndex}" dataView (now with LogsDB backing index)...`
+ );
+ // add some more data when upgraded
+ await createDocs(streamConvertedToLogsDBIndex, { isStream: true }, toTimeForScenarios);
+ });
+
+ after(async () => {
+ await dataStreams.deleteDataStream(streamIndex);
+ });
+
+ runTestsForEachScenario(streamConvertedToLogsDBIndex, 'logsdb', (indexes) => {
+ it(`should visualize a date histogram chart`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: '@timestamp',
+ });
+
+ // check that a basic agg on a field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it(`should visualize a date histogram chart using a different date field`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: '@timestamp',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', 'utc_time'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream using another time field', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: 'utc_time',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', '@timestamp'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize correctly ES|QL queries based on a LogsDB stream', async () => {
+ await common.navigateToApp('discover');
+ await discover.selectTextBaseLang();
+ await header.waitUntilLoadingHasFinished();
+ await monacoEditor.setCodeEditorValue(
+ `from ${indexes
+ .map(({ index }) => index)
+ .join(', ')} | stats averageB = avg(bytes) by extension`
+ );
+ await testSubjects.click('querySubmitButton');
+ await header.waitUntilLoadingHasFinished();
+ await testSubjects.click('unifiedHistogramEditFlyoutVisualization');
+
+ await header.waitUntilLoadingHasFinished();
+
+ await retry.waitFor('lens flyout', async () => {
+ const dimensions = await testSubjects.findAll('lns-dimensionTrigger-textBased');
+ return (
+ dimensions.length === 2 && (await dimensions[1].getVisibleText()) === 'averageB'
+ );
+ });
+
+ // go back to Lens to not break the wrapping function
+ await common.navigateToApp('lens');
+ });
+ });
+ });
+
+ describe('LogsDB downgraded to regular data stream scenarios', () => {
+ const logsdbStream = 'logsdb_stream_dowgradable';
+ // rollover does not allow to change name, it will just change backing index underneath
+ const logsdbConvertedToStream = logsdbStream;
+
+ before(async () => {
+ log.info(`Creating "${logsdbStream}" data stream...`);
+ await dataStreams.createDataStream(
+ logsdbStream,
+ getDataMapping({ mode: 'logsdb' }),
+ 'logsdb'
+ );
+
+ // add some data to the stream
+ await createDocs(logsdbStream, { isStream: true }, fromTimeForScenarios);
+
+ log.info(`Update settings for "${logsdbStream}" dataView...`);
+ await kibanaServer.uiSettings.update({
+ 'dateFormat:tz': 'UTC',
+ 'timepicker:timeDefaults': '{ "from": "now-1y", "to": "now" }',
+ });
+ log.info(
+ `Dowgrade "${logsdbStream}" stream into regular stream "${logsdbConvertedToStream}"...`
+ );
+
+ await dataStreams.downgradeStream(
+ logsdbStream,
+ getDataMapping({ mode: 'logsdb' }),
+ 'logsdb'
+ );
+ log.info(
+ `Add more data to new "${logsdbConvertedToStream}" dataView (no longer LogsDB)...`
+ );
+ // add some more data when upgraded
+ await createDocs(logsdbConvertedToStream, { isStream: true }, toTimeForScenarios);
+ });
+
+ after(async () => {
+ await dataStreams.deleteDataStream(logsdbConvertedToStream);
+ });
+
+ runTestsForEachScenario(logsdbConvertedToStream, 'logsdb', (indexes) => {
+ it(`should visualize a date histogram chart`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: '@timestamp',
+ });
+
+ // check that a basic agg on a field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it(`should visualize a date histogram chart using a different date field`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: '@timestamp',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', 'utc_time'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream using another time field', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: 'utc_time',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', '@timestamp'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize correctly ES|QL queries based on a LogsDB stream', async () => {
+ await common.navigateToApp('discover');
+ await discover.selectTextBaseLang();
+
+ // Use the lens page object here also for discover: both use the same timePicker object
+ await lens.goToTimeRange(
+ fromTimeForScenarios,
+ moment
+ .utc(toTimeForScenarios, TIME_PICKER_FORMAT)
+ .add(2, 'hour')
+ .format(TIME_PICKER_FORMAT)
+ );
+
+ await header.waitUntilLoadingHasFinished();
+ await monacoEditor.setCodeEditorValue(
+ `from ${indexes
+ .map(({ index }) => index)
+ .join(', ')} | stats averageB = avg(bytes) by extension`
+ );
+ await testSubjects.click('querySubmitButton');
+ await header.waitUntilLoadingHasFinished();
+ await testSubjects.click('unifiedHistogramEditFlyoutVisualization');
+
+ await header.waitUntilLoadingHasFinished();
+
+ await retry.waitFor('lens flyout', async () => {
+ const dimensions = await testSubjects.findAll('lns-dimensionTrigger-textBased');
+ return (
+ dimensions.length === 2 && (await dimensions[1].getVisibleText()) === 'averageB'
+ );
+ });
+
+ // go back to Lens to not break the wrapping function
+ await common.navigateToApp('lens');
+ });
+ });
+ });
+ });
+ });
+ });
+}
diff --git a/x-pack/test/functional/apps/lens/group4/tsdb.ts b/x-pack/test/functional/apps/lens/group4/tsdb.ts
index bbe1eef8a442c..3a6aac5ffa39b 100644
--- a/x-pack/test/functional/apps/lens/group4/tsdb.ts
+++ b/x-pack/test/functional/apps/lens/group4/tsdb.ts
@@ -8,234 +8,16 @@
import expect from '@kbn/expect';
import { partition } from 'lodash';
import moment from 'moment';
-import { MappingProperty } from '@elastic/elasticsearch/lib/api/types';
import { FtrProviderContext } from '../../../ftr_provider_context';
-
-const TEST_DOC_COUNT = 100;
-const TIME_PICKER_FORMAT = 'MMM D, YYYY [@] HH:mm:ss.SSS';
-const timeSeriesMetrics: Record = {
- bytes_gauge: 'gauge',
- bytes_counter: 'counter',
-};
-const timeSeriesDimensions = ['request', 'url'];
-
-type TestDoc = Record>;
-
-const testDocTemplate: TestDoc = {
- agent: 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1',
- bytes: 6219,
- clientip: '223.87.60.27',
- extension: 'deb',
- geo: {
- srcdest: 'US:US',
- src: 'US',
- dest: 'US',
- coordinates: { lat: 39.41042861, lon: -88.8454325 },
- },
- host: 'artifacts.elastic.co',
- index: 'kibana_sample_data_logs',
- ip: '223.87.60.27',
- machine: { ram: 8589934592, os: 'win 8' },
- memory: null,
- message:
- '223.87.60.27 - - [2018-07-22T00:39:02.912Z] "GET /elasticsearch/elasticsearch-6.3.2.deb_1 HTTP/1.1" 200 6219 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1"',
- phpmemory: null,
- referer: 'http://twitter.com/success/wendy-lawrence',
- request: '/elasticsearch/elasticsearch-6.3.2.deb',
- response: 200,
- tags: ['success', 'info'],
- '@timestamp': '2018-07-22T00:39:02.912Z',
- url: 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.2.deb_1',
- utc_time: '2018-07-22T00:39:02.912Z',
- event: { dataset: 'sample_web_logs' },
- bytes_gauge: 0,
- bytes_counter: 0,
-};
-
-function getDataMapping(
- { tsdb, removeTSDBFields }: { tsdb: boolean; removeTSDBFields?: boolean } = {
- tsdb: false,
- }
-): Record {
- const dataStreamMapping: Record = {
- '@timestamp': {
- type: 'date',
- },
- agent: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- bytes: {
- type: 'long',
- },
- bytes_counter: {
- type: 'long',
- },
- bytes_gauge: {
- type: 'long',
- },
- clientip: {
- type: 'ip',
- },
- event: {
- properties: {
- dataset: {
- type: 'keyword',
- },
- },
- },
- extension: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- geo: {
- properties: {
- coordinates: {
- type: 'geo_point',
- },
- dest: {
- type: 'keyword',
- },
- src: {
- type: 'keyword',
- },
- srcdest: {
- type: 'keyword',
- },
- },
- },
- host: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- index: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- ip: {
- type: 'ip',
- },
- machine: {
- properties: {
- os: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- ram: {
- type: 'long',
- },
- },
- },
- memory: {
- type: 'double',
- },
- message: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- phpmemory: {
- type: 'long',
- },
- referer: {
- type: 'keyword',
- },
- request: {
- type: 'keyword',
- },
- response: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- tags: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- timestamp: {
- path: '@timestamp',
- type: 'alias',
- },
- url: {
- type: 'keyword',
- },
- utc_time: {
- type: 'date',
- },
- };
-
- if (tsdb) {
- // augment the current mapping
- for (const [fieldName, fieldMapping] of Object.entries(dataStreamMapping || {})) {
- if (
- timeSeriesMetrics[fieldName] &&
- (fieldMapping.type === 'double' || fieldMapping.type === 'long')
- ) {
- fieldMapping.time_series_metric = timeSeriesMetrics[fieldName];
- }
-
- if (timeSeriesDimensions.includes(fieldName) && fieldMapping.type === 'keyword') {
- fieldMapping.time_series_dimension = true;
- }
- }
- } else if (removeTSDBFields) {
- for (const fieldName of Object.keys(timeSeriesMetrics)) {
- delete dataStreamMapping[fieldName];
- }
- }
- return dataStreamMapping;
-}
-
-function sumFirstNValues(n: number, bars: Array<{ y: number }> | undefined): number {
- const indexes = Array(n)
- .fill(1)
- .map((_, i) => i);
- let countSum = 0;
- for (const index of indexes) {
- if (bars?.[index]) {
- countSum += bars[index].y;
- }
- }
- return countSum;
-}
+import {
+ type ScenarioIndexes,
+ TEST_DOC_COUNT,
+ TIME_PICKER_FORMAT,
+ getDataMapping,
+ getDocsGenerator,
+ setupScenarioRunner,
+ sumFirstNValues,
+} from './tsdb_logsdb_helpers';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const { common, lens, dashboard } = getPageObjects(['common', 'lens', 'dashboard']);
@@ -245,71 +27,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const es = getService('es');
const log = getService('log');
const dataStreams = getService('dataStreams');
- const elasticChart = getService('elasticChart');
const indexPatterns = getService('indexPatterns');
const esArchiver = getService('esArchiver');
const comboBox = getService('comboBox');
- const createDocs = async (
- esIndex: string,
- { isStream, removeTSDBFields }: { isStream: boolean; removeTSDBFields?: boolean },
- startTime: string
- ) => {
- log.info(
- `Adding ${TEST_DOC_COUNT} to ${esIndex} with starting time from ${moment
- .utc(startTime, TIME_PICKER_FORMAT)
- .format(TIME_PICKER_FORMAT)} to ${moment
- .utc(startTime, TIME_PICKER_FORMAT)
- .add(2 * TEST_DOC_COUNT, 'seconds')
- .format(TIME_PICKER_FORMAT)}`
- );
- const docs = Array(TEST_DOC_COUNT)
- .fill(testDocTemplate)
- .map((templateDoc, i) => {
- const timestamp = moment
- .utc(startTime, TIME_PICKER_FORMAT)
- .add(TEST_DOC_COUNT + i, 'seconds')
- .format();
- const doc: TestDoc = {
- ...templateDoc,
- '@timestamp': timestamp,
- utc_time: timestamp,
- bytes_gauge: Math.floor(Math.random() * 10000 * i),
- bytes_counter: 5000,
- };
- if (removeTSDBFields) {
- for (const field of Object.keys(timeSeriesMetrics)) {
- delete doc[field];
- }
- }
- return doc;
- });
-
- const result = await es.bulk(
- {
- index: esIndex,
- body: docs.map((d) => `{"${isStream ? 'create' : 'index'}": {}}\n${JSON.stringify(d)}\n`),
- },
- { meta: true }
- );
-
- const res = result.body;
-
- if (res.errors) {
- const resultsWithErrors = res.items
- .filter(({ index }) => index?.error)
- .map(({ index }) => index?.error);
- for (const error of resultsWithErrors) {
- log.error(`Error: ${JSON.stringify(error)}`);
- }
- const [indexExists, dataStreamExists] = await Promise.all([
- es.indices.exists({ index: esIndex }),
- es.indices.getDataStream({ name: esIndex }),
- ]);
- log.debug(`Index exists: ${indexExists} - Data stream exists: ${dataStreamExists}`);
- }
- log.info(`Indexed ${res.items.length} test data docs.`);
- };
+ const createDocs = getDocsGenerator(log, es, 'tsdb');
describe('lens tsdb', function () {
const tsdbIndex = 'kibana_sample_data_logstsdb';
@@ -592,23 +314,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
describe('Scenarios with changing stream type', () => {
- const now = moment().utc();
- const fromMoment = now.clone().subtract(1, 'hour');
- const toMoment = now.clone();
- const fromTimeForScenarios = fromMoment.format(TIME_PICKER_FORMAT);
- const toTimeForScenarios = toMoment.format(TIME_PICKER_FORMAT);
-
const getScenarios = (
initialIndex: string
): Array<{
name: string;
- indexes: Array<{
- index: string;
- create?: boolean;
- downsample?: boolean;
- tsdb?: boolean;
- removeTSDBFields?: boolean;
- }>;
+ indexes: ScenarioIndexes[];
}> => [
{
name: 'Dataview with no additional stream/index',
@@ -625,7 +335,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
name: 'Dataview with an additional downsampled TSDB stream',
indexes: [
{ index: initialIndex },
- { index: 'tsdb_index_2', create: true, tsdb: true, downsample: true },
+ { index: 'tsdb_index_2', create: true, mode: 'tsdb', downsample: true },
],
},
{
@@ -633,112 +343,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
indexes: [
{ index: initialIndex },
{ index: 'regular_index', create: true, removeTSDBFields: true },
- { index: 'tsdb_index_2', create: true, tsdb: true, downsample: true },
+ { index: 'tsdb_index_2', create: true, mode: 'tsdb', downsample: true },
],
},
{
name: 'Dataview with an additional TSDB stream',
- indexes: [{ index: initialIndex }, { index: 'tsdb_index_2', create: true, tsdb: true }],
+ indexes: [{ index: initialIndex }, { index: 'tsdb_index_2', create: true, mode: 'tsdb' }],
},
];
- function runTestsForEachScenario(
- initialIndex: string,
- testingFn: (
- indexes: Array<{
- index: string;
- create?: boolean;
- downsample?: boolean;
- tsdb?: boolean;
- removeTSDBFields?: boolean;
- }>
- ) => void
- ): void {
- for (const { name, indexes } of getScenarios(initialIndex)) {
- describe(name, () => {
- let dataViewName: string;
- let downsampledTargetIndex: string = '';
-
- before(async () => {
- for (const { index, create, downsample, tsdb, removeTSDBFields } of indexes) {
- if (create) {
- if (tsdb) {
- await dataStreams.createDataStream(
- index,
- getDataMapping({ tsdb, removeTSDBFields }),
- tsdb
- );
- } else {
- log.info(`creating a index "${index}" with mapping...`);
- await es.indices.create({
- index,
- mappings: {
- properties: getDataMapping({ tsdb: Boolean(tsdb), removeTSDBFields }),
- },
- });
- }
- // add data to the newly created index
- await createDocs(
- index,
- { isStream: Boolean(tsdb), removeTSDBFields },
- fromTimeForScenarios
- );
- }
- if (downsample) {
- downsampledTargetIndex = await dataStreams.downsampleTSDBIndex(index, {
- isStream: Boolean(tsdb),
- });
- }
- }
- dataViewName = `${indexes.map(({ index }) => index).join(',')}${
- downsampledTargetIndex ? `,${downsampledTargetIndex}` : ''
- }`;
- log.info(`creating a data view for "${dataViewName}"...`);
- await indexPatterns.create(
- {
- title: dataViewName,
- timeFieldName: '@timestamp',
- },
- { override: true }
- );
- await common.navigateToApp('lens');
- await elasticChart.setNewChartUiDebugFlag(true);
- // go to the
- await lens.goToTimeRange(
- fromTimeForScenarios,
- moment
- .utc(toTimeForScenarios, TIME_PICKER_FORMAT)
- .add(2, 'hour')
- .format(TIME_PICKER_FORMAT) // consider also new documents
- );
- });
-
- after(async () => {
- for (const { index, create, tsdb } of indexes) {
- if (create) {
- if (tsdb) {
- await dataStreams.deleteDataStream(index);
- } else {
- log.info(`deleting the index "${index}"...`);
- await es.indices.delete({
- index,
- });
- }
- }
- // no need to cleant he specific downsample index as everything linked to the stream
- // is cleaned up automatically
- }
- });
-
- beforeEach(async () => {
- await lens.switchDataPanelIndexPattern(dataViewName);
- await lens.removeLayer();
- });
-
- testingFn(indexes);
- });
- }
- }
+ const { runTestsForEachScenario, toTimeForScenarios, fromTimeForScenarios } =
+ setupScenarioRunner(getService, getPageObjects, getScenarios);
describe('Data-stream upgraded to TSDB scenarios', () => {
const streamIndex = 'data_stream';
@@ -747,7 +362,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async () => {
log.info(`Creating "${streamIndex}" data stream...`);
- await dataStreams.createDataStream(streamIndex, getDataMapping(), false);
+ await dataStreams.createDataStream(
+ streamIndex,
+ getDataMapping({ mode: 'tsdb' }),
+ undefined
+ );
// add some data to the stream
await createDocs(streamIndex, { isStream: true }, fromTimeForScenarios);
@@ -759,8 +378,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
log.info(`Upgrade "${streamIndex}" stream to TSDB...`);
- const tsdbMapping = getDataMapping({ tsdb: true });
- await dataStreams.upgradeStreamToTSDB(streamIndex, tsdbMapping);
+ const tsdbMapping = getDataMapping({ mode: 'tsdb' });
+ await dataStreams.upgradeStream(streamIndex, tsdbMapping, 'tsdb');
log.info(
`Add more data to new "${streamConvertedToTsdbIndex}" dataView (now with TSDB backing index)...`
);
@@ -772,7 +391,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dataStreams.deleteDataStream(streamIndex);
});
- runTestsForEachScenario(streamConvertedToTsdbIndex, (indexes) => {
+ runTestsForEachScenario(streamConvertedToTsdbIndex, 'tsdb', (indexes) => {
it('should detect the data stream has now been upgraded to TSDB', async () => {
await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
@@ -850,7 +469,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async () => {
log.info(`Creating "${tsdbStream}" data stream...`);
- await dataStreams.createDataStream(tsdbStream, getDataMapping({ tsdb: true }), true);
+ await dataStreams.createDataStream(tsdbStream, getDataMapping({ mode: 'tsdb' }), 'tsdb');
// add some data to the stream
await createDocs(tsdbStream, { isStream: true }, fromTimeForScenarios);
@@ -864,7 +483,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
`Dowgrade "${tsdbStream}" stream into regular stream "${tsdbConvertedToStream}"...`
);
- await dataStreams.downgradeTSDBtoStream(tsdbStream, getDataMapping({ tsdb: true }));
+ await dataStreams.downgradeStream(tsdbStream, getDataMapping({ mode: 'tsdb' }), 'tsdb');
log.info(`Add more data to new "${tsdbConvertedToStream}" dataView (no longer TSDB)...`);
// add some more data when upgraded
await createDocs(tsdbConvertedToStream, { isStream: true }, toTimeForScenarios);
@@ -874,7 +493,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dataStreams.deleteDataStream(tsdbConvertedToStream);
});
- runTestsForEachScenario(tsdbConvertedToStream, (indexes) => {
+ runTestsForEachScenario(tsdbConvertedToStream, 'tsdb', (indexes) => {
it('should keep TSDB restrictions only if a tsdb stream is in the dataView mix', async () => {
await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
@@ -893,7 +512,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
testSubjects.exists(`lns-indexPatternDimension-average incompatible`, {
timeout: 500,
})
- ).to.eql(indexes.some(({ tsdb }) => tsdb));
+ ).to.eql(indexes.some(({ mode }) => mode === 'tsdb'));
await lens.closeDimensionEditor();
});
diff --git a/x-pack/test/functional/apps/lens/group4/tsdb_logsdb_helpers.ts b/x-pack/test/functional/apps/lens/group4/tsdb_logsdb_helpers.ts
new file mode 100644
index 0000000000000..e0169ebbae575
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group4/tsdb_logsdb_helpers.ts
@@ -0,0 +1,480 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { Client } from '@elastic/elasticsearch';
+import { MappingProperty } from '@elastic/elasticsearch/lib/api/types';
+import { ToolingLog } from '@kbn/tooling-log';
+import moment from 'moment';
+import type { FtrProviderContext } from '../../../ftr_provider_context';
+
+export const TEST_DOC_COUNT = 100;
+export const TIME_PICKER_FORMAT = 'MMM D, YYYY [@] HH:mm:ss.SSS';
+export const timeSeriesMetrics: Record = {
+ bytes_gauge: 'gauge',
+ bytes_counter: 'counter',
+};
+export const timeSeriesDimensions = ['request', 'url'];
+export const logsDBSpecialFields = ['host'];
+
+export const sharedESArchive =
+ 'test/functional/fixtures/es_archiver/kibana_sample_data_logs_logsdb';
+export const fromTime = 'Apr 16, 2023 @ 00:00:00.000';
+export const toTime = 'Jun 16, 2023 @ 00:00:00.000';
+
+export type TestDoc = Record>;
+
+export function testDocTemplate(mode: 'tsdb' | 'logsdb'): TestDoc {
+ return {
+ agent: 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1',
+ bytes: 6219,
+ clientip: '223.87.60.27',
+ extension: 'deb',
+ geo: {
+ srcdest: 'US:US',
+ src: 'US',
+ dest: 'US',
+ coordinates: { lat: 39.41042861, lon: -88.8454325 },
+ },
+ host: mode === 'tsdb' ? 'artifacts.elastic.co' : { name: 'artifacts.elastic.co' },
+ index: 'kibana_sample_data_logs',
+ ip: '223.87.60.27',
+ machine: { ram: 8589934592, os: 'win 8' },
+ memory: null,
+ message:
+ '223.87.60.27 - - [2018-07-22T00:39:02.912Z] "GET /elasticsearch/elasticsearch-6.3.2.deb_1 HTTP/1.1" 200 6219 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1"',
+ phpmemory: null,
+ referer: 'http://twitter.com/success/wendy-lawrence',
+ request: '/elasticsearch/elasticsearch-6.3.2.deb',
+ response: 200,
+ tags: ['success', 'info'],
+ '@timestamp': '2018-07-22T00:39:02.912Z',
+ url: 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.2.deb_1',
+ utc_time: '2018-07-22T00:39:02.912Z',
+ event: { dataset: 'sample_web_logs' },
+ bytes_gauge: 0,
+ bytes_counter: 0,
+ };
+}
+
+export function getDataMapping({
+ mode,
+ removeTSDBFields,
+ removeLogsDBFields,
+}: {
+ mode: 'tsdb' | 'logsdb';
+ removeTSDBFields?: boolean;
+ removeLogsDBFields?: boolean;
+}): Record {
+ const dataStreamMapping: Record = {
+ '@timestamp': {
+ type: 'date',
+ },
+ agent: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ bytes: {
+ type: 'long',
+ },
+ bytes_counter: {
+ type: 'long',
+ },
+ bytes_gauge: {
+ type: 'long',
+ },
+ clientip: {
+ type: 'ip',
+ },
+ event: {
+ properties: {
+ dataset: {
+ type: 'keyword',
+ },
+ },
+ },
+ extension: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ geo: {
+ properties: {
+ coordinates: {
+ type: 'geo_point',
+ },
+ dest: {
+ type: 'keyword',
+ },
+ src: {
+ type: 'keyword',
+ },
+ srcdest: {
+ type: 'keyword',
+ },
+ },
+ },
+ host:
+ mode === 'tsdb'
+ ? {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ }
+ : {
+ properties: {
+ name: {
+ type: 'keyword',
+ },
+ },
+ },
+ index: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ ip: {
+ type: 'ip',
+ },
+ machine: {
+ properties: {
+ os: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ ram: {
+ type: 'long',
+ },
+ },
+ },
+ memory: {
+ type: 'double',
+ },
+ message: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ phpmemory: {
+ type: 'long',
+ },
+ referer: {
+ type: 'keyword',
+ },
+ request: {
+ type: 'keyword',
+ },
+ response: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ tags: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ timestamp: {
+ path: '@timestamp',
+ type: 'alias',
+ },
+ url: {
+ type: 'keyword',
+ },
+ utc_time: {
+ type: 'date',
+ },
+ };
+
+ if (mode === 'tsdb') {
+ // augment the current mapping
+ for (const [fieldName, fieldMapping] of Object.entries(dataStreamMapping || {})) {
+ if (
+ timeSeriesMetrics[fieldName] &&
+ (fieldMapping.type === 'double' || fieldMapping.type === 'long')
+ ) {
+ fieldMapping.time_series_metric = timeSeriesMetrics[fieldName];
+ }
+
+ if (timeSeriesDimensions.includes(fieldName) && fieldMapping.type === 'keyword') {
+ fieldMapping.time_series_dimension = true;
+ }
+ }
+ }
+ if (removeTSDBFields) {
+ for (const fieldName of Object.keys(timeSeriesMetrics)) {
+ delete dataStreamMapping[fieldName];
+ }
+ }
+ if (removeLogsDBFields) {
+ for (const fieldName of logsDBSpecialFields) {
+ delete dataStreamMapping[fieldName];
+ }
+ }
+ return dataStreamMapping;
+}
+
+export function sumFirstNValues(n: number, bars: Array<{ y: number }> | undefined): number {
+ const indexes = Array(n)
+ .fill(1)
+ .map((_, i) => i);
+ let countSum = 0;
+ for (const index of indexes) {
+ if (bars?.[index]) {
+ countSum += bars[index].y;
+ }
+ }
+ return countSum;
+}
+
+export const getDocsGenerator =
+ (log: ToolingLog, es: Client, mode: 'tsdb' | 'logsdb') =>
+ async (
+ esIndex: string,
+ {
+ isStream,
+ removeTSDBFields,
+ removeLogsDBFields,
+ }: { isStream: boolean; removeTSDBFields?: boolean; removeLogsDBFields?: boolean },
+ startTime: string
+ ) => {
+ log.info(
+ `Adding ${TEST_DOC_COUNT} to ${esIndex} with starting time from ${moment
+ .utc(startTime, TIME_PICKER_FORMAT)
+ .format(TIME_PICKER_FORMAT)} to ${moment
+ .utc(startTime, TIME_PICKER_FORMAT)
+ .add(2 * TEST_DOC_COUNT, 'seconds')
+ .format(TIME_PICKER_FORMAT)}`
+ );
+ const docs = Array(TEST_DOC_COUNT)
+ .fill(testDocTemplate(mode))
+ .map((templateDoc, i) => {
+ const timestamp = moment
+ .utc(startTime, TIME_PICKER_FORMAT)
+ .add(TEST_DOC_COUNT + i, 'seconds')
+ .format();
+ const doc: TestDoc = {
+ ...templateDoc,
+ '@timestamp': timestamp,
+ utc_time: timestamp,
+ bytes_gauge: Math.floor(Math.random() * 10000 * i),
+ bytes_counter: 5000,
+ };
+ if (removeTSDBFields) {
+ for (const field of Object.keys(timeSeriesMetrics)) {
+ delete doc[field];
+ }
+ }
+ // do not remove the fields for logsdb - ignore the flag
+ return doc;
+ });
+
+ const result = await es.bulk(
+ {
+ index: esIndex,
+ body: docs.map((d) => `{"${isStream ? 'create' : 'index'}": {}}\n${JSON.stringify(d)}\n`),
+ },
+ { meta: true }
+ );
+
+ const res = result.body;
+
+ if (res.errors) {
+ const resultsWithErrors = res.items
+ .filter(({ index }) => index?.error)
+ .map(({ index }) => index?.error);
+ for (const error of resultsWithErrors) {
+ log.error(`Error: ${JSON.stringify(error)}`);
+ }
+ const [indexExists, dataStreamExists] = await Promise.all([
+ es.indices.exists({ index: esIndex }),
+ es.indices.getDataStream({ name: esIndex }),
+ ]);
+ log.debug(`Index exists: ${indexExists} - Data stream exists: ${dataStreamExists}`);
+ }
+ log.info(`Indexed ${res.items.length} test data docs.`);
+ };
+
+export interface ScenarioIndexes {
+ index: string;
+ create?: boolean;
+ downsample?: boolean;
+ removeTSDBFields?: boolean;
+ removeLogsDBFields?: boolean;
+ mode?: 'tsdb' | 'logsdb';
+}
+type GetScenarioFn = (initialIndex: string) => Array<{
+ name: string;
+ indexes: ScenarioIndexes[];
+}>;
+
+export function setupScenarioRunner(
+ getService: FtrProviderContext['getService'],
+ getPageObjects: FtrProviderContext['getPageObjects'],
+ getScenario: GetScenarioFn
+) {
+ const now = moment().utc();
+ const fromMoment = now.clone().subtract(1, 'hour');
+ const toMoment = now.clone();
+ const fromTimeForScenarios = fromMoment.format(TIME_PICKER_FORMAT);
+ const toTimeForScenarios = toMoment.format(TIME_PICKER_FORMAT);
+
+ function runTestsForEachScenario(
+ initialIndex: string,
+ scenarioMode: 'tsdb' | 'logsdb',
+ testingFn: (indexes: ScenarioIndexes[]) => void
+ ): void {
+ const { common, lens } = getPageObjects(['common', 'lens', 'dashboard']);
+ const es = getService('es');
+ const log = getService('log');
+ const dataStreams = getService('dataStreams');
+ const elasticChart = getService('elasticChart');
+ const indexPatterns = getService('indexPatterns');
+ const createDocs = getDocsGenerator(log, es, scenarioMode);
+
+ for (const { name, indexes } of getScenario(initialIndex)) {
+ describe(name, () => {
+ let dataViewName: string;
+ let downsampledTargetIndex: string = '';
+
+ before(async () => {
+ for (const {
+ index,
+ create,
+ downsample,
+ mode,
+ removeTSDBFields,
+ removeLogsDBFields,
+ } of indexes) {
+ // Validate the scenario config
+ if (downsample && mode !== 'tsdb') {
+ expect().fail('Cannot create a scenario with downsampled stream without tsdb');
+ }
+ // Kick off the creation
+ const isStream = mode !== undefined;
+ if (create) {
+ if (isStream) {
+ await dataStreams.createDataStream(
+ index,
+ getDataMapping({
+ mode,
+ removeTSDBFields: Boolean(removeTSDBFields || mode === 'logsdb'),
+ removeLogsDBFields,
+ }),
+ mode
+ );
+ } else {
+ log.info(`creating a index "${index}" with mapping...`);
+ await es.indices.create({
+ index,
+ mappings: {
+ properties: getDataMapping({
+ mode: mode === 'logsdb' ? 'logsdb' : 'tsdb', // use tsdb by default in regular index is specified
+ removeTSDBFields,
+ removeLogsDBFields,
+ }),
+ },
+ });
+ }
+ // add data to the newly created index
+ await createDocs(
+ index,
+ { isStream, removeTSDBFields, removeLogsDBFields },
+ fromTimeForScenarios
+ );
+ }
+ if (downsample) {
+ downsampledTargetIndex = await dataStreams.downsampleTSDBIndex(index, {
+ isStream: mode === 'tsdb',
+ });
+ }
+ }
+ dataViewName = `${indexes.map(({ index }) => index).join(',')}${
+ downsampledTargetIndex ? `,${downsampledTargetIndex}` : ''
+ }`;
+ log.info(`creating a data view for "${dataViewName}"...`);
+ await indexPatterns.create(
+ {
+ title: dataViewName,
+ timeFieldName: '@timestamp',
+ },
+ { override: true }
+ );
+ await common.navigateToApp('lens');
+ await elasticChart.setNewChartUiDebugFlag(true);
+ // go to the
+ await lens.goToTimeRange(
+ fromTimeForScenarios,
+ moment
+ .utc(toTimeForScenarios, TIME_PICKER_FORMAT)
+ .add(2, 'hour')
+ .format(TIME_PICKER_FORMAT) // consider also new documents
+ );
+ });
+
+ after(async () => {
+ for (const { index, create, mode: indexMode } of indexes) {
+ if (create) {
+ if (indexMode === 'tsdb' || indexMode === 'logsdb') {
+ await dataStreams.deleteDataStream(index);
+ } else {
+ log.info(`deleting the index "${index}"...`);
+ await es.indices.delete({
+ index,
+ });
+ }
+ }
+ // no need to cleant he specific downsample index as everything linked to the stream
+ // is cleaned up automatically
+ }
+ });
+
+ beforeEach(async () => {
+ await lens.switchDataPanelIndexPattern(dataViewName);
+ await lens.removeLayer();
+ });
+
+ testingFn(indexes);
+ });
+ }
+ }
+
+ return { runTestsForEachScenario, fromTimeForScenarios, toTimeForScenarios };
+}
diff --git a/x-pack/test/functional/services/data_stream.ts b/x-pack/test/functional/services/data_stream.ts
index 2864be1e0dc2b..f4b33213e62dd 100644
--- a/x-pack/test/functional/services/data_stream.ts
+++ b/x-pack/test/functional/services/data_stream.ts
@@ -9,7 +9,7 @@ import type { MappingProperty } from '@elastic/elasticsearch/lib/api/types';
import type { FtrProviderContext } from '../ftr_provider_context';
/**
- * High level interface to operate with Elasticsearch data stream and TSDS.
+ * High level interface to operate with Elasticsearch data stream and TSDS/LogsDB.
*/
export function DataStreamProvider({ getService, getPageObject }: FtrProviderContext) {
const es = getService('es');
@@ -112,23 +112,45 @@ export function DataStreamProvider({ getService, getPageObject }: FtrProviderCon
async function updateDataStreamTemplate(
stream: string,
mapping: Record,
- tsdb?: boolean
+ mode?: 'tsdb' | 'logsdb'
) {
await es.cluster.putComponentTemplate({
name: `${stream}_mapping`,
template: {
- settings: tsdb
- ? {
+ settings: !mode
+ ? { mode: undefined }
+ : mode === 'logsdb'
+ ? { mode: 'logsdb' }
+ : {
mode: 'time_series',
routing_path: 'request',
- }
- : { mode: undefined },
+ },
mappings: {
properties: mapping,
},
},
});
- log.info(`Updating ${stream} index template${tsdb ? ' for TSDB' : ''}...`);
+ // Uncomment only when needed
+ // log.debug(`
+ // PUT _component_template/${stream}_mappings
+ // ${JSON.stringify({
+ // name: `${stream}_mapping`,
+ // template: {
+ // settings: !mode
+ // ? { mode: undefined }
+ // : mode === 'logsdb'
+ // ? { mode: 'logsdb' }
+ // : {
+ // mode: 'time_series',
+ // routing_path: 'request',
+ // },
+ // mappings: {
+ // properties: mapping,
+ // },
+ // },
+ // }, null, 2)}
+ // `);
+ log.info(`Updating ${stream} index template${mode ? ` for ${mode.toUpperCase()}` : ''}...`);
await es.indices.putIndexTemplate({
name: `${stream}_index_template`,
index_patterns: [stream],
@@ -138,71 +160,98 @@ export function DataStreamProvider({ getService, getPageObject }: FtrProviderCon
description: `Template for ${stream} testing index`,
},
});
+ // Uncomment only when needed
+ // log.verbose(`
+ // PUT _index_template/${stream}-index-template
+ // ${JSON.stringify({
+ // name: `${stream}_index_template`,
+ // index_patterns: [stream],
+ // data_stream: {},
+ // composed_of: [`${stream}_mapping`],
+ // _meta: {
+ // description: `Template for ${stream} testing index`,
+ // },
+ // }, null, 2)}
+ // `);
}
/**
- * "Upgrade" a given data stream into a time series data series (TSDB/TSDS)
+ * "Upgrade" a given data stream into a TSDB or LogsDB data series
* @param stream the data stream name
* @param newMapping the new mapping already with time series metrics/dimensions configured
*/
- async function upgradeStreamToTSDB(stream: string, newMapping: Record) {
- // rollover to upgrade the index type to time_series
+ async function upgradeStream(
+ stream: string,
+ newMapping: Record,
+ mode: 'tsdb' | 'logsdb'
+ ) {
+ // rollover to upgrade the index type
// uploading a new mapping for the stream index using the provided metric/dimension list
- log.info(`Updating ${stream} data stream component template with TSDB stuff...`);
- await updateDataStreamTemplate(stream, newMapping, true);
+ log.info(`Updating ${stream} data stream component template with ${mode} stuff...`);
+ await updateDataStreamTemplate(stream, newMapping, mode);
- log.info('Rolling over the backing index for TSDB');
+ log.info(`Rolling over the backing index for ${mode}`);
await es.indices.rollover({
alias: stream,
});
+ // Uncomment only when needed
+ // log.verbose(`POST ${stream}/_rollover`);
}
/**
- * "Downgrade" a TSDB/TSDS data stream into a regular data stream
- * @param tsdbStream the TSDB/TSDS data stream to "downgrade"
+ * "Downgrade" a TSDB/TSDS/LogsDB data stream into a regular data stream
+ * @param stream the TSDB/TSDS/LogsDB data stream to "downgrade"
* @param oldMapping the new mapping already with time series metrics/dimensions already removed
*/
- async function downgradeTSDBtoStream(
- tsdbStream: string,
- newMapping: Record
+ async function downgradeStream(
+ stream: string,
+ newMapping: Record,
+ mode: 'tsdb' | 'logsdb'
) {
- // strip out any time-series specific mapping
- for (const fieldMapping of Object.values(newMapping || {})) {
- if ('time_series_metric' in fieldMapping) {
- delete fieldMapping.time_series_metric;
- }
- if ('time_series_dimension' in fieldMapping) {
- delete fieldMapping.time_series_dimension;
+ if (mode === 'tsdb') {
+ // strip out any time-series specific mapping
+ for (const fieldMapping of Object.values(newMapping || {})) {
+ if ('time_series_metric' in fieldMapping) {
+ delete fieldMapping.time_series_metric;
+ }
+ if ('time_series_dimension' in fieldMapping) {
+ delete fieldMapping.time_series_dimension;
+ }
}
+ log.info(`Updating ${stream} data stream component template with TSDB stuff...`);
+ await updateDataStreamTemplate(stream, newMapping);
}
- log.info(`Updating ${tsdbStream} data stream component template with TSDB stuff...`);
- await updateDataStreamTemplate(tsdbStream, newMapping, false);
+
// rollover to downgrade the index type to regular stream
- log.info(`Rolling over the ${tsdbStream} data stream into a regular data stream...`);
+ log.info(`Rolling over the ${stream} data stream into a regular data stream...`);
await es.indices.rollover({
- alias: tsdbStream,
+ alias: stream,
});
+ // Uncomment only when needed
+ // log.debug(`POST ${stream}/_rollover`);
}
/**
* Takes care of the entire process to create a data stream
* @param streamIndex name of the new data stream to create
* @param mappings the mapping to associate with the data stream
- * @param tsdb when enabled it will configure the data stream as a TSDB/TSDS
+ * @param tsdb when enabled it will configure the data stream as a TSDB/TSDS/LogsDB
*/
async function createDataStream(
streamIndex: string,
mappings: Record,
- tsdb: boolean = true
+ mode: 'tsdb' | 'logsdb' | undefined
) {
log.info(`Creating ${streamIndex} data stream component template...`);
- await updateDataStreamTemplate(streamIndex, mappings, tsdb);
+ await updateDataStreamTemplate(streamIndex, mappings, mode);
log.info(`Creating ${streamIndex} data stream index...`);
await es.indices.createDataStream({
name: streamIndex,
});
+ // Uncomment only when needed
+ // log.debug(`PUT _data_stream/${streamIndex}`);
}
/**
@@ -212,21 +261,27 @@ export function DataStreamProvider({ getService, getPageObject }: FtrProviderCon
async function deleteDataStream(streamIndex: string) {
log.info(`Delete ${streamIndex} data stream index...`);
await es.indices.deleteDataStream({ name: streamIndex });
+ // Uncomment only when needed
+ // log.debug(`DELETE _data_stream/${streamIndex}`);
log.info(`Delete ${streamIndex} index template...`);
await es.indices.deleteIndexTemplate({
name: `${streamIndex}_index_template`,
});
+ // Uncomment only when needed
+ // log.debug(`DELETE _index_template/${streamIndex}-index-template`);
log.info(`Delete ${streamIndex} data stream component template...`);
await es.cluster.deleteComponentTemplate({
name: `${streamIndex}_mapping`,
});
+ // Uncomment only when needed
+ // log.debug(`DELETE _component_template/${streamIndex}_mappings`);
}
return {
createDataStream,
deleteDataStream,
downsampleTSDBIndex,
- upgradeStreamToTSDB,
- downgradeTSDBtoStream,
+ upgradeStream,
+ downgradeStream,
};
}
diff --git a/x-pack/test/security_solution_cypress/cypress/screens/all_cases.ts b/x-pack/test/security_solution_cypress/cypress/screens/all_cases.ts
index 8dbc850fb017c..dbc9cd7c83f0e 100644
--- a/x-pack/test/security_solution_cypress/cypress/screens/all_cases.ts
+++ b/x-pack/test/security_solution_cypress/cypress/screens/all_cases.ts
@@ -5,8 +5,7 @@
* 2.0.
*/
-export const ALL_CASES_CLOSED_CASES_STATS =
- '[data-test-subj="closedStatsHeader"] .euiDescriptionList__description';
+export const ALL_CASES_CLOSED_CASES_STATS = '[data-test-subj="closedStatsHeader"] .euiStat__title';
export const ALL_CASES_COMMENTS_COUNT = '[data-test-subj="case-table-column-commentCount"]';
@@ -15,7 +14,7 @@ export const ALL_CASES_CREATE_NEW_CASE_BTN = '[data-test-subj="createNewCaseBtn"
export const ALL_CASES_CREATE_NEW_CASE_TABLE_BTN = '[data-test-subj="cases-table-add-case"]';
export const ALL_CASES_IN_PROGRESS_CASES_STATS =
- '[data-test-subj="inProgressStatsHeader"] .euiDescriptionList__description';
+ '[data-test-subj="inProgressStatsHeader"] .euiStat__title';
export const ALL_CASES_NAME = '[data-test-subj="case-details-link"]';
@@ -27,8 +26,7 @@ export const ALL_CASES_STATUS_FILTER = '[data-test-subj="options-filter-popover-
export const ALL_CASES_OPEN_FILTER = '[data-test-subj="options-filter-popover-item-open"]';
-export const ALL_CASES_OPEN_CASES_STATS =
- '[data-test-subj="openStatsHeader"] .euiDescriptionList__description';
+export const ALL_CASES_OPEN_CASES_STATS = '[data-test-subj="openStatsHeader"] .euiStat__title';
export const ALL_CASES_OPENED_ON = '[data-test-subj="case-table-column-createdAt"]';
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index 8918b2848bc36..038e9baa5086a 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -168,6 +168,8 @@
"@kbn/reporting-server",
"@kbn/data-quality-plugin",
"@kbn/ml-trained-models-utils",
+ "@kbn/observability-synthetics-test-data",
+ "@kbn/ml-trained-models-utils",
"@kbn/openapi-common",
"@kbn/securitysolution-lists-common",
"@kbn/securitysolution-exceptions-common",
@@ -181,6 +183,7 @@
"@kbn/management-settings-ids",
"@kbn/mock-idp-utils",
"@kbn/cloud-security-posture-common",
- "@kbn/saved-objects-management-plugin"
+ "@kbn/saved-objects-management-plugin",
+ "@kbn/alerting-types"
]
}
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/cloud_security_metering.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/cloud_security_metering.ts
index 01c2ebf9a64a7..b3db98c829afd 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/cloud_security_metering.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/cloud_security_metering.ts
@@ -11,9 +11,9 @@ import { LATEST_FINDINGS_INDEX_DEFAULT_NS } from '@kbn/cloud-security-posture-pl
import * as http from 'http';
import {
deleteIndex,
- addIndex,
createPackagePolicy,
createCloudDefendPackagePolicy,
+ bulkIndex,
} from '@kbn/test-suites-xpack/api_integration/apis/cloud_security_posture/helper';
import { RoleCredentials } from '../../../../../shared/services';
import { getMockFindings, getMockDefendForContainersHeartbeats } from './mock_data';
@@ -38,8 +38,7 @@ export default function (providerContext: FtrProviderContext) {
The task manager is running by default in security serverless project in the background and sending usage API requests to the usage API.
This test mocks the usage API server and intercepts the usage API request sent by the metering background task manager.
*/
- // FLAKY: https://github.com/elastic/kibana/issues/188660
- describe.skip('Intercept the usage API request sent by the metering background task manager', function () {
+ describe('Intercept the usage API request sent by the metering background task manager', function () {
this.tags(['skipMKI']);
let mockUsageApiServer: http.Server;
@@ -117,7 +116,7 @@ export default function (providerContext: FtrProviderContext) {
numberOfFindings: 10,
});
- await addIndex(
+ await bulkIndex(
es,
[...billableFindings, ...notBillableFindings],
LATEST_FINDINGS_INDEX_DEFAULT_NS
@@ -161,7 +160,7 @@ export default function (providerContext: FtrProviderContext) {
numberOfFindings: 11,
});
- await addIndex(
+ await bulkIndex(
es,
[...billableFindings, ...notBillableFindings],
LATEST_FINDINGS_INDEX_DEFAULT_NS
@@ -200,7 +199,7 @@ export default function (providerContext: FtrProviderContext) {
numberOfFindings: 2,
});
- await addIndex(es, billableFindings, CDR_LATEST_NATIVE_VULNERABILITIES_INDEX_PATTERN);
+ await bulkIndex(es, billableFindings, CDR_LATEST_NATIVE_VULNERABILITIES_INDEX_PATTERN);
let interceptedRequestBody: UsageRecord[] = [];
@@ -234,7 +233,7 @@ export default function (providerContext: FtrProviderContext) {
isBlockActionEnables: false,
numberOfHearbeats: 2,
});
- await addIndex(
+ await bulkIndex(
es,
[...blockActionEnabledHeartbeats, ...blockActionDisabledHeartbeats],
CLOUD_DEFEND_HEARTBEAT_INDEX_DEFAULT_NS
@@ -316,7 +315,7 @@ export default function (providerContext: FtrProviderContext) {
});
await Promise.all([
- addIndex(
+ bulkIndex(
es,
[
...billableFindingsCSPM,
@@ -326,8 +325,8 @@ export default function (providerContext: FtrProviderContext) {
],
LATEST_FINDINGS_INDEX_DEFAULT_NS
),
- addIndex(es, [...billableFindingsCNVM], CDR_LATEST_NATIVE_VULNERABILITIES_INDEX_PATTERN),
- addIndex(
+ bulkIndex(es, [...billableFindingsCNVM], CDR_LATEST_NATIVE_VULNERABILITIES_INDEX_PATTERN),
+ bulkIndex(
es,
[...blockActionEnabledHeartbeats, ...blockActionDisabledHeartbeats],
CLOUD_DEFEND_HEARTBEAT_INDEX_DEFAULT_NS
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_data.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_data.ts
index 2455c8e1762cc..5e5844eaaf3b5 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_data.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_data.ts
@@ -95,13 +95,13 @@ export const getMockDefendForContainersHeartbeats = ({
mockDefendForContainersHeartbeats(isBlockActionEnables)
);
};
-const mockDefendForContainersHeartbeats = (isBlockActionEnables: boolean) => {
+const mockDefendForContainersHeartbeats = (isBlockActionEnabled: boolean) => {
return {
agent: {
id: chance.guid(),
},
cloud_defend: {
- block_action_enabled: isBlockActionEnables,
+ block_action_enabled: isBlockActionEnabled,
},
event: {
ingested: new Date().toISOString(),
diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_connectors_page.ts b/x-pack/test_serverless/functional/page_objects/svl_search_connectors_page.ts
index 1f834cce9d847..615e3397a45ce 100644
--- a/x-pack/test_serverless/functional/page_objects/svl_search_connectors_page.ts
+++ b/x-pack/test_serverless/functional/page_objects/svl_search_connectors_page.ts
@@ -50,7 +50,7 @@ export function SvlSearchConnectorsPageProvider({ getService }: FtrProviderConte
expect(await testSubjects.getVisibleText('serverlessSearchConnectorName')).to.be(name);
},
async editType(type: string) {
- await testSubjects.existOrFail('serverlessSearchEditConnectorTypeLabel');
+ await testSubjects.existOrFail('serverlessSearchEditConnectorType');
await testSubjects.existOrFail('serverlessSearchEditConnectorTypeChoices');
await testSubjects.click('serverlessSearchEditConnectorTypeChoices');
await testSubjects.exists('serverlessSearchConnectorServiceType-zoom');
diff --git a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/index.ts b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/index.ts
index b6eeef5a70f90..db58761270144 100644
--- a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/index.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/index.ts
@@ -75,6 +75,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
loadTestFile(require.resolve('./smokescreen.ts'));
loadTestFile(require.resolve('./tsdb.ts'));
+ loadTestFile(require.resolve('./logsdb.ts'));
loadTestFile(require.resolve('./vega_chart.ts'));
});
};
diff --git a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/logsdb.ts b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/logsdb.ts
new file mode 100644
index 0000000000000..4fe3046aa5dbe
--- /dev/null
+++ b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/logsdb.ts
@@ -0,0 +1,586 @@
+/*
+ * 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 expect from '@kbn/expect';
+import moment from 'moment';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+import {
+ type ScenarioIndexes,
+ getDataMapping,
+ getDocsGenerator,
+ setupScenarioRunner,
+ TIME_PICKER_FORMAT,
+} from './tsdb_logsdb_helpers';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const { common, lens, discover, header } = getPageObjects([
+ 'common',
+ 'lens',
+ 'discover',
+ 'header',
+ ]);
+ const testSubjects = getService('testSubjects');
+ const find = getService('find');
+ const kibanaServer = getService('kibanaServer');
+ const es = getService('es');
+ const log = getService('log');
+ const dataStreams = getService('dataStreams');
+ const indexPatterns = getService('indexPatterns');
+ const esArchiver = getService('esArchiver');
+ const monacoEditor = getService('monacoEditor');
+ const retry = getService('retry');
+
+ const createDocs = getDocsGenerator(log, es, 'logsdb');
+
+ describe('lens logsdb', function () {
+ const logsdbIndex = 'kibana_sample_data_logslogsdb';
+ const logsdbDataView = logsdbIndex;
+ const logsdbEsArchive = 'test/functional/fixtures/es_archiver/kibana_sample_data_logs_logsdb';
+ const fromTime = 'Apr 16, 2023 @ 00:00:00.000';
+ const toTime = 'Jun 16, 2023 @ 00:00:00.000';
+
+ before(async () => {
+ log.info(`loading ${logsdbIndex} index...`);
+ await esArchiver.loadIfNeeded(logsdbEsArchive);
+ log.info(`creating a data view for "${logsdbDataView}"...`);
+ await indexPatterns.create(
+ {
+ title: logsdbDataView,
+ timeFieldName: '@timestamp',
+ },
+ { override: true }
+ );
+ log.info(`updating settings to use the "${logsdbDataView}" dataView...`);
+ await kibanaServer.uiSettings.update({
+ 'dateFormat:tz': 'UTC',
+ defaultIndex: '0ae0bc7a-e4ca-405c-ab67-f2b5913f2a51',
+ 'timepicker:timeDefaults': `{ "from": "${fromTime}", "to": "${toTime}" }`,
+ });
+ });
+
+ after(async () => {
+ await kibanaServer.savedObjects.cleanStandardList();
+ await kibanaServer.uiSettings.replace({});
+ await es.indices.delete({ index: [logsdbIndex] });
+ });
+
+ describe('smoke testing functions support', () => {
+ before(async () => {
+ await common.navigateToApp('lens');
+ await lens.switchDataPanelIndexPattern(logsdbDataView);
+ await lens.goToTimeRange();
+ });
+
+ afterEach(async () => {
+ await lens.removeLayer();
+ });
+
+ // skip count for now as it's a special function and will
+ // change automatically the unsupported field to Records when detected
+ const allOperations = [
+ 'average',
+ 'max',
+ 'last_value',
+ 'median',
+ 'percentile',
+ 'percentile_rank',
+ 'standard_deviation',
+ 'sum',
+ 'unique_count',
+ 'min',
+ 'max',
+ 'counter_rate',
+ 'last_value',
+ ];
+
+ it(`should work with all operations`, async () => {
+ // start from a count() over a date histogram
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: '@timestamp',
+ });
+
+ // minimum supports all logsdb field types
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'count',
+ field: 'bytes',
+ keepOpen: true,
+ });
+
+ // now check that operations won't show the incompatibility tooltip
+ for (const operation of allOperations) {
+ expect(
+ testSubjects.exists(`lns-indexPatternDimension-${operation} incompatible`, {
+ timeout: 500,
+ })
+ ).to.eql(false);
+ }
+
+ for (const operation of allOperations) {
+ // try to change to the provided function and check all is ok
+ await lens.selectOperation(operation);
+
+ expect(
+ await find.existsByCssSelector(
+ '[data-test-subj="indexPattern-field-selection-row"] .euiFormErrorText'
+ )
+ ).to.be(false);
+ }
+ await lens.closeDimensionEditor();
+ });
+
+ describe('Scenarios with changing stream type', () => {
+ const getScenarios = (
+ initialIndex: string
+ ): Array<{
+ name: string;
+ indexes: ScenarioIndexes[];
+ }> => [
+ {
+ name: 'LogsDB stream with no additional stream/index',
+ indexes: [{ index: initialIndex }],
+ },
+ {
+ name: 'LogsDB stream with no additional stream/index and no host.name field',
+ indexes: [
+ {
+ index: `${initialIndex}_no_host`,
+ removeLogsDBFields: true,
+ create: true,
+ mode: 'logsdb',
+ },
+ ],
+ },
+ {
+ name: 'LogsDB stream with an additional regular index',
+ indexes: [{ index: initialIndex }, { index: 'regular_index', create: true }],
+ },
+ {
+ name: 'LogsDB stream with an additional LogsDB stream',
+ indexes: [
+ { index: initialIndex },
+ { index: 'logsdb_index_2', create: true, mode: 'logsdb' },
+ ],
+ },
+ {
+ name: 'LogsDB stream with an additional TSDB stream',
+ indexes: [{ index: initialIndex }, { index: 'tsdb_index', create: true, mode: 'tsdb' }],
+ },
+ {
+ name: 'LogsDB stream with an additional TSDB stream downsampled',
+ indexes: [
+ { index: initialIndex },
+ { index: 'tsdb_index_downsampled', create: true, mode: 'tsdb', downsample: true },
+ ],
+ },
+ ];
+
+ const { runTestsForEachScenario, toTimeForScenarios, fromTimeForScenarios } =
+ setupScenarioRunner(getService, getPageObjects, getScenarios);
+
+ describe('Data-stream upgraded to LogsDB scenarios', () => {
+ const streamIndex = 'data_stream';
+ // rollover does not allow to change name, it will just change backing index underneath
+ const streamConvertedToLogsDBIndex = streamIndex;
+
+ before(async () => {
+ log.info(`Creating "${streamIndex}" data stream...`);
+ await dataStreams.createDataStream(
+ streamIndex,
+ getDataMapping({ mode: 'logsdb' }),
+ undefined
+ );
+
+ // add some data to the stream
+ await createDocs(streamIndex, { isStream: true }, fromTimeForScenarios);
+
+ log.info(`Update settings for "${streamIndex}" dataView...`);
+ await kibanaServer.uiSettings.update({
+ 'dateFormat:tz': 'UTC',
+ 'timepicker:timeDefaults': '{ "from": "now-1y", "to": "now" }',
+ });
+ log.info(`Upgrade "${streamIndex}" stream to LogsDB...`);
+
+ const logsdbMapping = getDataMapping({ mode: 'logsdb' });
+ await dataStreams.upgradeStream(streamIndex, logsdbMapping, 'logsdb');
+ log.info(
+ `Add more data to new "${streamConvertedToLogsDBIndex}" dataView (now with LogsDB backing index)...`
+ );
+ // add some more data when upgraded
+ await createDocs(streamConvertedToLogsDBIndex, { isStream: true }, toTimeForScenarios);
+ });
+
+ after(async () => {
+ await dataStreams.deleteDataStream(streamIndex);
+ });
+
+ runTestsForEachScenario(streamConvertedToLogsDBIndex, 'logsdb', (indexes) => {
+ it(`should visualize a date histogram chart`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: '@timestamp',
+ });
+
+ // check that a basic agg on a field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it(`should visualize a date histogram chart using a different date field`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: '@timestamp',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', 'utc_time'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream using another time field', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: 'utc_time',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', '@timestamp'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize correctly ES|QL queries based on a LogsDB stream', async () => {
+ await common.navigateToApp('discover');
+ await discover.selectTextBaseLang();
+ await header.waitUntilLoadingHasFinished();
+ await monacoEditor.setCodeEditorValue(
+ `from ${indexes
+ .map(({ index }) => index)
+ .join(', ')} | stats averageB = avg(bytes) by extension`
+ );
+ await testSubjects.click('querySubmitButton');
+ await header.waitUntilLoadingHasFinished();
+ await testSubjects.click('unifiedHistogramEditFlyoutVisualization');
+
+ await header.waitUntilLoadingHasFinished();
+
+ await retry.waitFor('lens flyout', async () => {
+ const dimensions = await testSubjects.findAll('lns-dimensionTrigger-textBased');
+ return (
+ dimensions.length === 2 && (await dimensions[1].getVisibleText()) === 'averageB'
+ );
+ });
+
+ // go back to Lens to not break the wrapping function
+ await common.navigateToApp('lens');
+ });
+ });
+ });
+
+ describe('LogsDB downgraded to regular data stream scenarios', () => {
+ const logsdbStream = 'logsdb_stream_dowgradable';
+ // rollover does not allow to change name, it will just change backing index underneath
+ const logsdbConvertedToStream = logsdbStream;
+
+ before(async () => {
+ log.info(`Creating "${logsdbStream}" data stream...`);
+ await dataStreams.createDataStream(
+ logsdbStream,
+ getDataMapping({ mode: 'logsdb' }),
+ 'logsdb'
+ );
+
+ // add some data to the stream
+ await createDocs(logsdbStream, { isStream: true }, fromTimeForScenarios);
+
+ log.info(`Update settings for "${logsdbStream}" dataView...`);
+ await kibanaServer.uiSettings.update({
+ 'dateFormat:tz': 'UTC',
+ 'timepicker:timeDefaults': '{ "from": "now-1y", "to": "now" }',
+ });
+ log.info(
+ `Dowgrade "${logsdbStream}" stream into regular stream "${logsdbConvertedToStream}"...`
+ );
+
+ await dataStreams.downgradeStream(
+ logsdbStream,
+ getDataMapping({ mode: 'logsdb' }),
+ 'logsdb'
+ );
+ log.info(
+ `Add more data to new "${logsdbConvertedToStream}" dataView (no longer LogsDB)...`
+ );
+ // add some more data when upgraded
+ await createDocs(logsdbConvertedToStream, { isStream: true }, toTimeForScenarios);
+ });
+
+ after(async () => {
+ await dataStreams.deleteDataStream(logsdbConvertedToStream);
+ });
+
+ runTestsForEachScenario(logsdbConvertedToStream, 'logsdb', (indexes) => {
+ it(`should visualize a date histogram chart`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: '@timestamp',
+ });
+
+ // check that a basic agg on a field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it(`should visualize a date histogram chart using a different date field`, async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+
+ log.info('Check counter data before the upgrade');
+ // check there's some data before the upgrade
+ expect(bars?.[0].y).to.be.above(0);
+ log.info('Check counter data after the upgrade');
+ // check there's some data after the upgrade
+ expect(bars?.[bars.length - 1].y).to.be.above(0);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: '@timestamp',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', 'utc_time'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize an annotation layer from a logsDB stream using another time field', async () => {
+ await lens.configureDimension({
+ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+ operation: 'date_histogram',
+ field: 'utc_time',
+ });
+
+ // check the counter field works
+ await lens.configureDimension({
+ dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+ operation: 'min',
+ field: `bytes`,
+ });
+ await lens.createLayer('annotations');
+
+ expect(
+ (await find.allByCssSelector(`[data-test-subj^="lns-layerPanel-"]`)).length
+ ).to.eql(2);
+ expect(
+ await (
+ await testSubjects.find('lnsXY_xAnnotationsPanel > lns-dimensionTrigger')
+ ).getVisibleText()
+ ).to.eql('Event');
+ await testSubjects.click('lnsXY_xAnnotationsPanel > lns-dimensionTrigger');
+ await testSubjects.click('lnsXY_annotation_query');
+ await lens.configureQueryAnnotation({
+ queryString: 'host.name: *',
+ timeField: 'utc_time',
+ textDecoration: { type: 'name' },
+ extraFields: ['host.name', '@timestamp'],
+ });
+ await lens.closeDimensionEditor();
+
+ await testSubjects.existOrFail('xyVisGroupedAnnotationIcon');
+ await lens.removeLayer(1);
+ });
+
+ it('should visualize correctly ES|QL queries based on a LogsDB stream', async () => {
+ await common.navigateToApp('discover');
+ await discover.selectTextBaseLang();
+
+ // Use the lens page object here also for discover: both use the same timePicker object
+ await lens.goToTimeRange(
+ fromTimeForScenarios,
+ moment
+ .utc(toTimeForScenarios, TIME_PICKER_FORMAT)
+ .add(2, 'hour')
+ .format(TIME_PICKER_FORMAT)
+ );
+
+ await header.waitUntilLoadingHasFinished();
+ await monacoEditor.setCodeEditorValue(
+ `from ${indexes
+ .map(({ index }) => index)
+ .join(', ')} | stats averageB = avg(bytes) by extension`
+ );
+ await testSubjects.click('querySubmitButton');
+ await header.waitUntilLoadingHasFinished();
+ await testSubjects.click('unifiedHistogramEditFlyoutVisualization');
+
+ await header.waitUntilLoadingHasFinished();
+
+ await retry.waitFor('lens flyout', async () => {
+ const dimensions = await testSubjects.findAll('lns-dimensionTrigger-textBased');
+ return (
+ dimensions.length === 2 && (await dimensions[1].getVisibleText()) === 'averageB'
+ );
+ });
+
+ // go back to Lens to not break the wrapping function
+ await common.navigateToApp('lens');
+ });
+ });
+ });
+ });
+ });
+ });
+}
diff --git a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/tsdb.ts b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/tsdb.ts
index 99633e01940c1..111cf30e919c5 100644
--- a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/tsdb.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/tsdb.ts
@@ -8,239 +8,20 @@
import expect from '@kbn/expect';
import { partition } from 'lodash';
import moment from 'moment';
-import { MappingProperty } from '@elastic/elasticsearch/lib/api/types';
import { FtrProviderContext } from '../../../../ftr_provider_context';
-
-const TEST_DOC_COUNT = 100;
-const TIME_PICKER_FORMAT = 'MMM D, YYYY [@] HH:mm:ss.SSS';
-const timeSeriesMetrics: Record = {
- bytes_gauge: 'gauge',
- bytes_counter: 'counter',
-};
-const timeSeriesDimensions = ['request', 'url'];
-
-type TestDoc = Record>;
-
-const testDocTemplate: TestDoc = {
- agent: 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1',
- bytes: 6219,
- clientip: '223.87.60.27',
- extension: 'deb',
- geo: {
- srcdest: 'US:US',
- src: 'US',
- dest: 'US',
- coordinates: { lat: 39.41042861, lon: -88.8454325 },
- },
- host: 'artifacts.elastic.co',
- index: 'kibana_sample_data_logs',
- ip: '223.87.60.27',
- machine: { ram: 8589934592, os: 'win 8' },
- memory: null,
- message:
- '223.87.60.27 - - [2018-07-22T00:39:02.912Z] "GET /elasticsearch/elasticsearch-6.3.2.deb_1 HTTP/1.1" 200 6219 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1"',
- phpmemory: null,
- referer: 'http://twitter.com/success/wendy-lawrence',
- request: '/elasticsearch/elasticsearch-6.3.2.deb',
- response: 200,
- tags: ['success', 'info'],
- '@timestamp': '2018-07-22T00:39:02.912Z',
- url: 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.2.deb_1',
- utc_time: '2018-07-22T00:39:02.912Z',
- event: { dataset: 'sample_web_logs' },
- bytes_gauge: 0,
- bytes_counter: 0,
-};
-
-function getDataMapping(
- { tsdb, removeTSDBFields }: { tsdb: boolean; removeTSDBFields?: boolean } = {
- tsdb: false,
- }
-): Record {
- const dataStreamMapping: Record = {
- '@timestamp': {
- type: 'date',
- },
- agent: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- bytes: {
- type: 'long',
- },
- bytes_counter: {
- type: 'long',
- },
- bytes_gauge: {
- type: 'long',
- },
- clientip: {
- type: 'ip',
- },
- event: {
- properties: {
- dataset: {
- type: 'keyword',
- },
- },
- },
- extension: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- geo: {
- properties: {
- coordinates: {
- type: 'geo_point',
- },
- dest: {
- type: 'keyword',
- },
- src: {
- type: 'keyword',
- },
- srcdest: {
- type: 'keyword',
- },
- },
- },
- host: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- index: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- ip: {
- type: 'ip',
- },
- machine: {
- properties: {
- os: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- ram: {
- type: 'long',
- },
- },
- },
- memory: {
- type: 'double',
- },
- message: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- phpmemory: {
- type: 'long',
- },
- referer: {
- type: 'keyword',
- },
- request: {
- type: 'keyword',
- },
- response: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- tags: {
- fields: {
- keyword: {
- ignore_above: 256,
- type: 'keyword',
- },
- },
- type: 'text',
- },
- timestamp: {
- path: '@timestamp',
- type: 'alias',
- },
- url: {
- type: 'keyword',
- },
- utc_time: {
- type: 'date',
- },
- };
-
- if (tsdb) {
- // augment the current mapping
- for (const [fieldName, fieldMapping] of Object.entries(dataStreamMapping || {})) {
- if (
- timeSeriesMetrics[fieldName] &&
- (fieldMapping.type === 'double' || fieldMapping.type === 'long')
- ) {
- fieldMapping.time_series_metric = timeSeriesMetrics[fieldName];
- }
-
- if (timeSeriesDimensions.includes(fieldName) && fieldMapping.type === 'keyword') {
- fieldMapping.time_series_dimension = true;
- }
- }
- } else if (removeTSDBFields) {
- for (const fieldName of Object.keys(timeSeriesMetrics)) {
- delete dataStreamMapping[fieldName];
- }
- }
- return dataStreamMapping;
-}
-
-function sumFirstNValues(n: number, bars: Array<{ y: number }>): number {
- const indexes = Array(n)
- .fill(1)
- .map((_, i) => i);
- let countSum = 0;
- for (const index of indexes) {
- if (bars[index]) {
- countSum += bars[index].y;
- }
- }
- return countSum;
-}
+import {
+ type ScenarioIndexes,
+ TEST_DOC_COUNT,
+ TIME_PICKER_FORMAT,
+ getDataMapping,
+ getDocsGenerator,
+ setupScenarioRunner,
+ sumFirstNValues,
+} from './tsdb_logsdb_helpers';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
- const PageObjects = getPageObjects([
+ const { common, lens, dashboard, svlCommonPage } = getPageObjects([
'common',
- 'timePicker',
'lens',
'dashboard',
'svlCommonPage',
@@ -251,71 +32,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const es = getService('es');
const log = getService('log');
const dataStreams = getService('dataStreams');
- const elasticChart = getService('elasticChart');
const indexPatterns = getService('indexPatterns');
const esArchiver = getService('esArchiver');
const comboBox = getService('comboBox');
- const createDocs = async (
- esIndex: string,
- { isStream, removeTSDBFields }: { isStream: boolean; removeTSDBFields?: boolean },
- startTime: string
- ) => {
- log.info(
- `Adding ${TEST_DOC_COUNT} to ${esIndex} with starting time from ${moment
- .utc(startTime, TIME_PICKER_FORMAT)
- .format(TIME_PICKER_FORMAT)} to ${moment
- .utc(startTime, TIME_PICKER_FORMAT)
- .add(2 * TEST_DOC_COUNT, 'seconds')
- .format(TIME_PICKER_FORMAT)}`
- );
- const docs = Array(TEST_DOC_COUNT)
- .fill(testDocTemplate)
- .map((templateDoc, i) => {
- const timestamp = moment
- .utc(startTime, TIME_PICKER_FORMAT)
- .add(TEST_DOC_COUNT + i, 'seconds')
- .format();
- const doc: TestDoc = {
- ...templateDoc,
- '@timestamp': timestamp,
- utc_time: timestamp,
- bytes_gauge: Math.floor(Math.random() * 10000 * i),
- bytes_counter: 5000,
- };
- if (removeTSDBFields) {
- for (const field of Object.keys(timeSeriesMetrics)) {
- delete doc[field];
- }
- }
- return doc;
- });
-
- const result = await es.bulk(
- {
- index: esIndex,
- body: docs.map((d) => `{"${isStream ? 'create' : 'index'}": {}}\n${JSON.stringify(d)}\n`),
- },
- { meta: true }
- );
-
- const res = result.body;
-
- if (res.errors) {
- const resultsWithErrors = res.items
- .filter(({ index }) => index?.error)
- .map(({ index }) => index?.error);
- for (const error of resultsWithErrors) {
- log.error(`Error: ${JSON.stringify(error)}`);
- }
- const [indexExists, dataStreamExists] = await Promise.all([
- es.indices.exists({ index: esIndex }),
- es.indices.getDataStream({ name: esIndex }),
- ]);
- log.debug(`Index exists: ${indexExists} - Data stream exists: ${dataStreamExists}`);
- }
- log.info(`Indexed ${res.items.length} test data docs.`);
- };
+ const createDocs = getDocsGenerator(log, es, 'tsdb');
describe('lens tsdb', function () {
const tsdbIndex = 'kibana_sample_data_logstsdb';
@@ -325,7 +46,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const toTime = 'Jun 16, 2023 @ 00:00:00.000';
before(async () => {
- await PageObjects.svlCommonPage.loginAsAdmin();
+ await svlCommonPage.loginAsAdmin();
log.info(`loading ${tsdbIndex} index...`);
await esArchiver.loadIfNeeded(tsdbEsArchive);
log.info(`creating a data view for "${tsdbDataView}"...`);
@@ -375,48 +96,48 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
describe('for regular metric', () => {
it('defaults to median for non-rolled up metric', async () => {
- await PageObjects.common.navigateToApp('lens');
- await PageObjects.lens.switchDataPanelIndexPattern(tsdbDataView);
- await PageObjects.lens.waitForField('bytes_gauge');
- await PageObjects.lens.dragFieldToWorkspace('bytes_gauge', 'xyVisChart');
- expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+ await common.navigateToApp('lens');
+ await lens.switchDataPanelIndexPattern(tsdbDataView);
+ await lens.waitForField('bytes_gauge');
+ await lens.dragFieldToWorkspace('bytes_gauge', 'xyVisChart');
+ expect(await lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
'Median of bytes_gauge'
);
});
it('does not show a warning', async () => {
- await PageObjects.lens.openDimensionEditor('lnsXY_yDimensionPanel');
+ await lens.openDimensionEditor('lnsXY_yDimensionPanel');
await testSubjects.missingOrFail('median-partial-warning');
- await PageObjects.lens.assertNoEditorWarning();
- await PageObjects.lens.closeDimensionEditor();
+ await lens.assertNoEditorWarning();
+ await lens.closeDimensionEditor();
});
});
describe('for rolled up metric (downsampled)', () => {
it('defaults to average for rolled up metric', async () => {
- await PageObjects.lens.switchDataPanelIndexPattern(downsampleDataView.dataView);
- await PageObjects.lens.removeLayer();
- await PageObjects.lens.waitForField('bytes_gauge');
- await PageObjects.lens.dragFieldToWorkspace('bytes_gauge', 'xyVisChart');
- expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+ await lens.switchDataPanelIndexPattern(downsampleDataView.dataView);
+ await lens.removeLayer();
+ await lens.waitForField('bytes_gauge');
+ await lens.dragFieldToWorkspace('bytes_gauge', 'xyVisChart');
+ expect(await lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
'Average of bytes_gauge'
);
});
it('shows warnings in editor when using median', async () => {
- await PageObjects.lens.openDimensionEditor('lnsXY_yDimensionPanel');
+ await lens.openDimensionEditor('lnsXY_yDimensionPanel');
await testSubjects.existOrFail('median-partial-warning');
await testSubjects.click('lns-indexPatternDimension-median');
- await PageObjects.lens.waitForVisualization('xyVisChart');
- await PageObjects.lens.assertMessageListContains(
+ await lens.waitForVisualization('xyVisChart');
+ await lens.assertMessageListContains(
'Median of bytes_gauge uses a function that is unsupported by rolled up data. Select a different function or change the time range.',
'warning'
);
});
it('shows warnings in dashboards as well', async () => {
- await PageObjects.lens.save('New', false, false, false, 'new');
+ await lens.save('New', false, false, false, 'new');
- await PageObjects.dashboard.waitForRenderComplete();
- await PageObjects.lens.assertMessageListContains(
+ await dashboard.waitForRenderComplete();
+ await lens.assertMessageListContains(
'Median of bytes_gauge uses a function that is unsupported by rolled up data. Select a different function or change the time range.',
'warning'
);
@@ -426,13 +147,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
describe('time series special field types support', () => {
before(async () => {
- await PageObjects.common.navigateToApp('lens');
- await PageObjects.lens.switchDataPanelIndexPattern(tsdbDataView);
- await PageObjects.lens.goToTimeRange();
+ await common.navigateToApp('lens');
+ await lens.switchDataPanelIndexPattern(tsdbDataView);
+ await lens.goToTimeRange();
});
afterEach(async () => {
- await PageObjects.lens.removeLayer();
+ await lens.removeLayer();
});
// skip count for now as it's a special function and will
@@ -467,14 +188,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
if (supportedOperations.length) {
it(`should allow operations when supported by ${fieldType} field type`, async () => {
// Counter rate requires a date histogram dimension configured to work
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
// minimum supports all tsdb field types
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'min',
field: `bytes_${fieldType}`,
@@ -492,7 +213,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
for (const supportedOp of supportedOperations) {
// try to change to the provided function and check all is ok
- await PageObjects.lens.selectOperation(supportedOp.name);
+ await lens.selectOperation(supportedOp.name);
expect(
await find.existsByCssSelector(
@@ -501,22 +222,22 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
).to.be(false);
// return in a clean state before checking the next operation
- await PageObjects.lens.selectOperation('min');
+ await lens.selectOperation('min');
}
- await PageObjects.lens.closeDimensionEditor();
+ await lens.closeDimensionEditor();
});
}
if (unsupportedOperatons.length) {
it(`should notify the incompatibility of unsupported operations for the ${fieldType} field type`, async () => {
// Counter rate requires a date histogram dimension configured to work
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
// minimum supports all tsdb field types
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'min',
field: `bytes_${fieldType}`,
@@ -537,7 +258,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
for (const unsupportedOp of unsupportedOperatons) {
// try to change to the provided function and check if it's in an incompatibility state
- await PageObjects.lens.selectOperation(unsupportedOp.name, true);
+ await lens.selectOperation(unsupportedOp.name, true);
const fieldSelectErrorEl = await find.byCssSelector(
'[data-test-subj="indexPattern-field-selection-row"] .euiFormErrorText'
@@ -548,28 +269,28 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
);
// return in a clean state before checking the next operation
- await PageObjects.lens.selectOperation('min');
+ await lens.selectOperation('min');
}
- await PageObjects.lens.closeDimensionEditor();
+ await lens.closeDimensionEditor();
});
}
}
describe('show time series dimension groups within breakdown', () => {
it('should show the time series dimension group on field picker when configuring a breakdown', async () => {
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'min',
field: 'bytes_counter',
});
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_splitDimensionPanel > lns-empty-dimension',
operation: 'terms',
keepOpen: true,
@@ -577,46 +298,34 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const list = await comboBox.getOptionsList('indexPattern-dimension-field');
expect(list).to.contain('Time series dimensions');
- await PageObjects.lens.closeDimensionEditor();
+ await lens.closeDimensionEditor();
});
it("should not show the time series dimension group on field picker if it's not a breakdown", async () => {
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'min',
field: 'bytes_counter',
});
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
keepOpen: true,
});
const list = await comboBox.getOptionsList('indexPattern-dimension-field');
expect(list).to.not.contain('Time series dimensions');
- await PageObjects.lens.closeDimensionEditor();
+ await lens.closeDimensionEditor();
});
});
});
describe('Scenarios with changing stream type', () => {
- const now = moment().utc();
- const fromMoment = now.clone().subtract(1, 'hour');
- const toMoment = now.clone();
- const fromTimeForScenarios = fromMoment.format(TIME_PICKER_FORMAT);
- const toTimeForScenarios = toMoment.format(TIME_PICKER_FORMAT);
-
const getScenarios = (
initialIndex: string
): Array<{
name: string;
- indexes: Array<{
- index: string;
- create?: boolean;
- downsample?: boolean;
- tsdb?: boolean;
- removeTSDBFields?: boolean;
- }>;
+ indexes: ScenarioIndexes[];
}> => [
{
name: 'Dataview with no additional stream/index',
@@ -633,7 +342,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
name: 'Dataview with an additional downsampled TSDB stream',
indexes: [
{ index: initialIndex },
- { index: 'tsdb_index_2', create: true, tsdb: true, downsample: true },
+ { index: 'tsdb_index_2', create: true, mode: 'tsdb', downsample: true },
],
},
{
@@ -641,112 +350,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
indexes: [
{ index: initialIndex },
{ index: 'regular_index', create: true, removeTSDBFields: true },
- { index: 'tsdb_index_2', create: true, tsdb: true, downsample: true },
+ { index: 'tsdb_index_2', create: true, mode: 'tsdb', downsample: true },
],
},
{
name: 'Dataview with an additional TSDB stream',
- indexes: [{ index: initialIndex }, { index: 'tsdb_index_2', create: true, tsdb: true }],
+ indexes: [{ index: initialIndex }, { index: 'tsdb_index_2', create: true, mode: 'tsdb' }],
},
];
- function runTestsForEachScenario(
- initialIndex: string,
- testingFn: (
- indexes: Array<{
- index: string;
- create?: boolean;
- downsample?: boolean;
- tsdb?: boolean;
- removeTSDBFields?: boolean;
- }>
- ) => void
- ): void {
- for (const { name, indexes } of getScenarios(initialIndex)) {
- describe(name, () => {
- let dataViewName: string;
- let downsampledTargetIndex: string = '';
-
- before(async () => {
- for (const { index, create, downsample, tsdb, removeTSDBFields } of indexes) {
- if (create) {
- if (tsdb) {
- await dataStreams.createDataStream(
- index,
- getDataMapping({ tsdb, removeTSDBFields }),
- tsdb
- );
- } else {
- log.info(`creating a index "${index}" with mapping...`);
- await es.indices.create({
- index,
- mappings: {
- properties: getDataMapping({ tsdb: Boolean(tsdb), removeTSDBFields }),
- },
- });
- }
- // add data to the newly created index
- await createDocs(
- index,
- { isStream: Boolean(tsdb), removeTSDBFields },
- fromTimeForScenarios
- );
- }
- if (downsample) {
- downsampledTargetIndex = await dataStreams.downsampleTSDBIndex(index, {
- isStream: Boolean(tsdb),
- });
- }
- }
- dataViewName = `${indexes.map(({ index }) => index).join(',')}${
- downsampledTargetIndex ? `,${downsampledTargetIndex}` : ''
- }`;
- log.info(`creating a data view for "${dataViewName}"...`);
- await indexPatterns.create(
- {
- title: dataViewName,
- timeFieldName: '@timestamp',
- },
- { override: true }
- );
- await PageObjects.common.navigateToApp('lens');
- await elasticChart.setNewChartUiDebugFlag(true);
- // go to the
- await PageObjects.lens.goToTimeRange(
- fromTimeForScenarios,
- moment
- .utc(toTimeForScenarios, TIME_PICKER_FORMAT)
- .add(2, 'hour')
- .format(TIME_PICKER_FORMAT) // consider also new documents
- );
- });
-
- after(async () => {
- for (const { index, create, tsdb } of indexes) {
- if (create) {
- if (tsdb) {
- await dataStreams.deleteDataStream(index);
- } else {
- log.info(`deleting the index "${index}"...`);
- await es.indices.delete({
- index,
- });
- }
- }
- // no need to cleant he specific downsample index as everything linked to the stream
- // is cleaned up automatically
- }
- });
-
- beforeEach(async () => {
- await PageObjects.lens.switchDataPanelIndexPattern(dataViewName);
- await PageObjects.lens.removeLayer();
- });
-
- testingFn(indexes);
- });
- }
- }
+ const { runTestsForEachScenario, toTimeForScenarios, fromTimeForScenarios } =
+ setupScenarioRunner(getService, getPageObjects, getScenarios);
describe('Data-stream upgraded to TSDB scenarios', () => {
const streamIndex = 'data_stream';
@@ -755,7 +369,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async () => {
log.info(`Creating "${streamIndex}" data stream...`);
- await dataStreams.createDataStream(streamIndex, getDataMapping(), false);
+ await dataStreams.createDataStream(
+ streamIndex,
+ getDataMapping({ mode: 'tsdb' }),
+ undefined
+ );
// add some data to the stream
await createDocs(streamIndex, { isStream: true }, fromTimeForScenarios);
@@ -767,8 +385,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
log.info(`Upgrade "${streamIndex}" stream to TSDB...`);
- const tsdbMapping = getDataMapping({ tsdb: true });
- await dataStreams.upgradeStreamToTSDB(streamIndex, tsdbMapping);
+ const tsdbMapping = getDataMapping({ mode: 'tsdb' });
+ await dataStreams.upgradeStream(streamIndex, tsdbMapping, 'tsdb');
log.info(
`Add more data to new "${streamConvertedToTsdbIndex}" dataView (now with TSDB backing index)...`
);
@@ -780,15 +398,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dataStreams.deleteDataStream(streamIndex);
});
- runTestsForEachScenario(streamConvertedToTsdbIndex, (indexes) => {
+ runTestsForEachScenario(streamConvertedToTsdbIndex, 'tsdb', (indexes) => {
it('should detect the data stream has now been upgraded to TSDB', async () => {
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'min',
field: `bytes_counter`,
@@ -800,53 +418,53 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
timeout: 500,
})
).to.eql(false);
- await PageObjects.lens.closeDimensionEditor();
+ await lens.closeDimensionEditor();
});
it(`should visualize a date histogram chart for counter field`, async () => {
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
// check the counter field works
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'min',
field: `bytes_counter`,
});
// and also that the count of documents should be "indexes.length" times overall
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'count',
});
- await PageObjects.lens.waitForVisualization('xyVisChart');
- const data = await PageObjects.lens.getCurrentChartDebugState('xyVisChart');
- const counterBars = data.bars![0].bars;
- const countBars = data.bars![1].bars;
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const counterBars = data?.bars![0].bars;
+ const countBars = data?.bars![1].bars;
log.info('Check counter data before the upgrade');
// check there's some data before the upgrade
- expect(counterBars[0].y).to.eql(5000);
+ expect(counterBars?.[0].y).to.eql(5000);
log.info('Check counter data after the upgrade');
// check there's some data after the upgrade
- expect(counterBars[counterBars.length - 1].y).to.eql(5000);
+ expect(counterBars?.[counterBars.length - 1].y).to.eql(5000);
// due to the flaky nature of exact check here, we're going to relax it
// as long as there's data before and after it is ok
log.info('Check count before the upgrade');
- const columnsToCheck = countBars.length / 2;
+ const columnsToCheck = countBars ? countBars.length / 2 : 0;
// Before the upgrade the count is N times the indexes
expect(sumFirstNValues(columnsToCheck, countBars)).to.be.greaterThan(
indexes.length * TEST_DOC_COUNT - 1
);
log.info('Check count after the upgrade');
// later there are only documents for the upgraded stream
- expect(sumFirstNValues(columnsToCheck, [...countBars].reverse())).to.be.greaterThan(
- TEST_DOC_COUNT - 1
- );
+ expect(
+ sumFirstNValues(columnsToCheck, [...(countBars ?? [])].reverse())
+ ).to.be.greaterThan(TEST_DOC_COUNT - 1);
});
});
});
@@ -858,7 +476,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async () => {
log.info(`Creating "${tsdbStream}" data stream...`);
- await dataStreams.createDataStream(tsdbStream, getDataMapping({ tsdb: true }), true);
+ await dataStreams.createDataStream(tsdbStream, getDataMapping({ mode: 'tsdb' }), 'tsdb');
// add some data to the stream
await createDocs(tsdbStream, { isStream: true }, fromTimeForScenarios);
@@ -872,7 +490,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
`Dowgrade "${tsdbStream}" stream into regular stream "${tsdbConvertedToStream}"...`
);
- await dataStreams.downgradeTSDBtoStream(tsdbStream, getDataMapping({ tsdb: true }));
+ await dataStreams.downgradeStream(tsdbStream, getDataMapping({ mode: 'tsdb' }), 'tsdb');
log.info(`Add more data to new "${tsdbConvertedToStream}" dataView (no longer TSDB)...`);
// add some more data when upgraded
await createDocs(tsdbConvertedToStream, { isStream: true }, toTimeForScenarios);
@@ -882,15 +500,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dataStreams.deleteDataStream(tsdbConvertedToStream);
});
- runTestsForEachScenario(tsdbConvertedToStream, (indexes) => {
+ runTestsForEachScenario(tsdbConvertedToStream, 'tsdb', (indexes) => {
it('should keep TSDB restrictions only if a tsdb stream is in the dataView mix', async () => {
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'min',
field: `bytes_counter`,
@@ -901,28 +519,28 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
testSubjects.exists(`lns-indexPatternDimension-average incompatible`, {
timeout: 500,
})
- ).to.eql(indexes.some(({ tsdb }) => tsdb));
- await PageObjects.lens.closeDimensionEditor();
+ ).to.eql(indexes.some(({ mode }) => mode === 'tsdb'));
+ await lens.closeDimensionEditor();
});
it(`should visualize a date histogram chart for counter field`, async () => {
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
// just check the data is shown
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'count',
});
+ await lens.waitForVisualization('xyVisChart');
+ const data = await lens.getCurrentChartDebugState('xyVisChart');
+ const bars = data?.bars![0].bars;
+ const columnsToCheck = bars ? bars.length / 2 : 0;
// due to the flaky nature of exact check here, we're going to relax it
// as long as there's data before and after it is ok
- await PageObjects.lens.waitForVisualization('xyVisChart');
- const data = await PageObjects.lens.getCurrentChartDebugState('xyVisChart');
- const bars = data.bars![0].bars;
- const columnsToCheck = bars.length / 2;
log.info('Check count before the downgrade');
// Before the upgrade the count is N times the indexes
expect(sumFirstNValues(columnsToCheck, bars)).to.be.greaterThan(
@@ -930,14 +548,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
);
log.info('Check count after the downgrade');
// later there are only documents for the upgraded stream
- expect(sumFirstNValues(columnsToCheck, [...bars].reverse())).to.be.greaterThan(
+ expect(sumFirstNValues(columnsToCheck, [...(bars ?? [])].reverse())).to.be.greaterThan(
TEST_DOC_COUNT - 1
);
});
it('should visualize data when moving the time window around the downgrade moment', async () => {
// check after the downgrade
- await PageObjects.lens.goToTimeRange(
+ await lens.goToTimeRange(
moment
.utc(fromTimeForScenarios, TIME_PICKER_FORMAT)
.subtract(1, 'hour')
@@ -948,23 +566,23 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
.format(TIME_PICKER_FORMAT) // consider only new documents
);
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
operation: 'date_histogram',
field: '@timestamp',
});
- await PageObjects.lens.configureDimension({
+ await lens.configureDimension({
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
operation: 'count',
});
- await PageObjects.lens.waitForVisualization('xyVisChart');
- const dataBefore = await PageObjects.lens.getCurrentChartDebugState('xyVisChart');
- const barsBefore = dataBefore.bars![0].bars;
- expect(barsBefore.some(({ y }) => y)).to.eql(true);
+ await lens.waitForVisualization('xyVisChart');
+ const dataBefore = await lens.getCurrentChartDebugState('xyVisChart');
+ const barsBefore = dataBefore?.bars![0].bars;
+ expect(barsBefore?.some(({ y }) => y)).to.eql(true);
// check after the downgrade
- await PageObjects.lens.goToTimeRange(
+ await lens.goToTimeRange(
moment
.utc(toTimeForScenarios, TIME_PICKER_FORMAT)
.add(1, 'second')
@@ -975,10 +593,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
.format(TIME_PICKER_FORMAT) // consider also new documents
);
- await PageObjects.lens.waitForVisualization('xyVisChart');
- const dataAfter = await PageObjects.lens.getCurrentChartDebugState('xyVisChart');
- const barsAfter = dataAfter.bars![0].bars;
- expect(barsAfter.some(({ y }) => y)).to.eql(true);
+ await lens.waitForVisualization('xyVisChart');
+ const dataAfter = await lens.getCurrentChartDebugState('xyVisChart');
+ const barsAfter = dataAfter?.bars![0].bars;
+ expect(barsAfter?.some(({ y }) => y)).to.eql(true);
});
});
});
diff --git a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/tsdb_logsdb_helpers.ts b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/tsdb_logsdb_helpers.ts
new file mode 100644
index 0000000000000..23822aa1395a9
--- /dev/null
+++ b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/tsdb_logsdb_helpers.ts
@@ -0,0 +1,480 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { Client } from '@elastic/elasticsearch';
+import { MappingProperty } from '@elastic/elasticsearch/lib/api/types';
+import { ToolingLog } from '@kbn/tooling-log';
+import moment from 'moment';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export const TEST_DOC_COUNT = 100;
+export const TIME_PICKER_FORMAT = 'MMM D, YYYY [@] HH:mm:ss.SSS';
+export const timeSeriesMetrics: Record = {
+ bytes_gauge: 'gauge',
+ bytes_counter: 'counter',
+};
+export const timeSeriesDimensions = ['request', 'url'];
+export const logsDBSpecialFields = ['host'];
+
+export const sharedESArchive =
+ 'test/functional/fixtures/es_archiver/kibana_sample_data_logs_logsdb';
+export const fromTime = 'Apr 16, 2023 @ 00:00:00.000';
+export const toTime = 'Jun 16, 2023 @ 00:00:00.000';
+
+export type TestDoc = Record>;
+
+export function testDocTemplate(mode: 'tsdb' | 'logsdb'): TestDoc {
+ return {
+ agent: 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1',
+ bytes: 6219,
+ clientip: '223.87.60.27',
+ extension: 'deb',
+ geo: {
+ srcdest: 'US:US',
+ src: 'US',
+ dest: 'US',
+ coordinates: { lat: 39.41042861, lon: -88.8454325 },
+ },
+ host: mode === 'tsdb' ? 'artifacts.elastic.co' : { name: 'artifacts.elastic.co' },
+ index: 'kibana_sample_data_logs',
+ ip: '223.87.60.27',
+ machine: { ram: 8589934592, os: 'win 8' },
+ memory: null,
+ message:
+ '223.87.60.27 - - [2018-07-22T00:39:02.912Z] "GET /elasticsearch/elasticsearch-6.3.2.deb_1 HTTP/1.1" 200 6219 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1"',
+ phpmemory: null,
+ referer: 'http://twitter.com/success/wendy-lawrence',
+ request: '/elasticsearch/elasticsearch-6.3.2.deb',
+ response: 200,
+ tags: ['success', 'info'],
+ '@timestamp': '2018-07-22T00:39:02.912Z',
+ url: 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.2.deb_1',
+ utc_time: '2018-07-22T00:39:02.912Z',
+ event: { dataset: 'sample_web_logs' },
+ bytes_gauge: 0,
+ bytes_counter: 0,
+ };
+}
+
+export function getDataMapping({
+ mode,
+ removeTSDBFields,
+ removeLogsDBFields,
+}: {
+ mode: 'tsdb' | 'logsdb';
+ removeTSDBFields?: boolean;
+ removeLogsDBFields?: boolean;
+}): Record {
+ const dataStreamMapping: Record = {
+ '@timestamp': {
+ type: 'date',
+ },
+ agent: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ bytes: {
+ type: 'long',
+ },
+ bytes_counter: {
+ type: 'long',
+ },
+ bytes_gauge: {
+ type: 'long',
+ },
+ clientip: {
+ type: 'ip',
+ },
+ event: {
+ properties: {
+ dataset: {
+ type: 'keyword',
+ },
+ },
+ },
+ extension: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ geo: {
+ properties: {
+ coordinates: {
+ type: 'geo_point',
+ },
+ dest: {
+ type: 'keyword',
+ },
+ src: {
+ type: 'keyword',
+ },
+ srcdest: {
+ type: 'keyword',
+ },
+ },
+ },
+ host:
+ mode === 'tsdb'
+ ? {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ }
+ : {
+ properties: {
+ name: {
+ type: 'keyword',
+ },
+ },
+ },
+ index: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ ip: {
+ type: 'ip',
+ },
+ machine: {
+ properties: {
+ os: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ ram: {
+ type: 'long',
+ },
+ },
+ },
+ memory: {
+ type: 'double',
+ },
+ message: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ phpmemory: {
+ type: 'long',
+ },
+ referer: {
+ type: 'keyword',
+ },
+ request: {
+ type: 'keyword',
+ },
+ response: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ tags: {
+ fields: {
+ keyword: {
+ ignore_above: 256,
+ type: 'keyword',
+ },
+ },
+ type: 'text',
+ },
+ timestamp: {
+ path: '@timestamp',
+ type: 'alias',
+ },
+ url: {
+ type: 'keyword',
+ },
+ utc_time: {
+ type: 'date',
+ },
+ };
+
+ if (mode === 'tsdb') {
+ // augment the current mapping
+ for (const [fieldName, fieldMapping] of Object.entries(dataStreamMapping || {})) {
+ if (
+ timeSeriesMetrics[fieldName] &&
+ (fieldMapping.type === 'double' || fieldMapping.type === 'long')
+ ) {
+ fieldMapping.time_series_metric = timeSeriesMetrics[fieldName];
+ }
+
+ if (timeSeriesDimensions.includes(fieldName) && fieldMapping.type === 'keyword') {
+ fieldMapping.time_series_dimension = true;
+ }
+ }
+ }
+ if (removeTSDBFields) {
+ for (const fieldName of Object.keys(timeSeriesMetrics)) {
+ delete dataStreamMapping[fieldName];
+ }
+ }
+ if (removeLogsDBFields) {
+ for (const fieldName of logsDBSpecialFields) {
+ delete dataStreamMapping[fieldName];
+ }
+ }
+ return dataStreamMapping;
+}
+
+export function sumFirstNValues(n: number, bars: Array<{ y: number }> | undefined): number {
+ const indexes = Array(n)
+ .fill(1)
+ .map((_, i) => i);
+ let countSum = 0;
+ for (const index of indexes) {
+ if (bars?.[index]) {
+ countSum += bars[index].y;
+ }
+ }
+ return countSum;
+}
+
+export const getDocsGenerator =
+ (log: ToolingLog, es: Client, mode: 'tsdb' | 'logsdb') =>
+ async (
+ esIndex: string,
+ {
+ isStream,
+ removeTSDBFields,
+ removeLogsDBFields,
+ }: { isStream: boolean; removeTSDBFields?: boolean; removeLogsDBFields?: boolean },
+ startTime: string
+ ) => {
+ log.info(
+ `Adding ${TEST_DOC_COUNT} to ${esIndex} with starting time from ${moment
+ .utc(startTime, TIME_PICKER_FORMAT)
+ .format(TIME_PICKER_FORMAT)} to ${moment
+ .utc(startTime, TIME_PICKER_FORMAT)
+ .add(2 * TEST_DOC_COUNT, 'seconds')
+ .format(TIME_PICKER_FORMAT)}`
+ );
+ const docs = Array(TEST_DOC_COUNT)
+ .fill(testDocTemplate(mode))
+ .map((templateDoc, i) => {
+ const timestamp = moment
+ .utc(startTime, TIME_PICKER_FORMAT)
+ .add(TEST_DOC_COUNT + i, 'seconds')
+ .format();
+ const doc: TestDoc = {
+ ...templateDoc,
+ '@timestamp': timestamp,
+ utc_time: timestamp,
+ bytes_gauge: Math.floor(Math.random() * 10000 * i),
+ bytes_counter: 5000,
+ };
+ if (removeTSDBFields) {
+ for (const field of Object.keys(timeSeriesMetrics)) {
+ delete doc[field];
+ }
+ }
+ // do not remove the fields for logsdb - ignore the flag
+ return doc;
+ });
+
+ const result = await es.bulk(
+ {
+ index: esIndex,
+ body: docs.map((d) => `{"${isStream ? 'create' : 'index'}": {}}\n${JSON.stringify(d)}\n`),
+ },
+ { meta: true }
+ );
+
+ const res = result.body;
+
+ if (res.errors) {
+ const resultsWithErrors = res.items
+ .filter(({ index }) => index?.error)
+ .map(({ index }) => index?.error);
+ for (const error of resultsWithErrors) {
+ log.error(`Error: ${JSON.stringify(error)}`);
+ }
+ const [indexExists, dataStreamExists] = await Promise.all([
+ es.indices.exists({ index: esIndex }),
+ es.indices.getDataStream({ name: esIndex }),
+ ]);
+ log.debug(`Index exists: ${indexExists} - Data stream exists: ${dataStreamExists}`);
+ }
+ log.info(`Indexed ${res.items.length} test data docs.`);
+ };
+
+export interface ScenarioIndexes {
+ index: string;
+ create?: boolean;
+ downsample?: boolean;
+ removeTSDBFields?: boolean;
+ removeLogsDBFields?: boolean;
+ mode?: 'tsdb' | 'logsdb';
+}
+type GetScenarioFn = (initialIndex: string) => Array<{
+ name: string;
+ indexes: ScenarioIndexes[];
+}>;
+
+export function setupScenarioRunner(
+ getService: FtrProviderContext['getService'],
+ getPageObjects: FtrProviderContext['getPageObjects'],
+ getScenario: GetScenarioFn
+) {
+ const now = moment().utc();
+ const fromMoment = now.clone().subtract(1, 'hour');
+ const toMoment = now.clone();
+ const fromTimeForScenarios = fromMoment.format(TIME_PICKER_FORMAT);
+ const toTimeForScenarios = toMoment.format(TIME_PICKER_FORMAT);
+
+ function runTestsForEachScenario(
+ initialIndex: string,
+ scenarioMode: 'tsdb' | 'logsdb',
+ testingFn: (indexes: ScenarioIndexes[]) => void
+ ): void {
+ const { common, lens } = getPageObjects(['common', 'lens', 'dashboard']);
+ const es = getService('es');
+ const log = getService('log');
+ const dataStreams = getService('dataStreams');
+ const elasticChart = getService('elasticChart');
+ const indexPatterns = getService('indexPatterns');
+ const createDocs = getDocsGenerator(log, es, scenarioMode);
+
+ for (const { name, indexes } of getScenario(initialIndex)) {
+ describe(name, () => {
+ let dataViewName: string;
+ let downsampledTargetIndex: string = '';
+
+ before(async () => {
+ for (const {
+ index,
+ create,
+ downsample,
+ mode,
+ removeTSDBFields,
+ removeLogsDBFields,
+ } of indexes) {
+ // Validate the scenario config
+ if (downsample && mode !== 'tsdb') {
+ expect().fail('Cannot create a scenario with downsampled stream without tsdb');
+ }
+ // Kick off the creation
+ const isStream = mode !== undefined;
+ if (create) {
+ if (isStream) {
+ await dataStreams.createDataStream(
+ index,
+ getDataMapping({
+ mode,
+ removeTSDBFields: Boolean(removeTSDBFields || mode === 'logsdb'),
+ removeLogsDBFields,
+ }),
+ mode
+ );
+ } else {
+ log.info(`creating a index "${index}" with mapping...`);
+ await es.indices.create({
+ index,
+ mappings: {
+ properties: getDataMapping({
+ mode: mode === 'logsdb' ? 'logsdb' : 'tsdb', // use tsdb by default in regular index is specified
+ removeTSDBFields,
+ removeLogsDBFields,
+ }),
+ },
+ });
+ }
+ // add data to the newly created index
+ await createDocs(
+ index,
+ { isStream, removeTSDBFields, removeLogsDBFields },
+ fromTimeForScenarios
+ );
+ }
+ if (downsample) {
+ downsampledTargetIndex = await dataStreams.downsampleTSDBIndex(index, {
+ isStream: mode === 'tsdb',
+ });
+ }
+ }
+ dataViewName = `${indexes.map(({ index }) => index).join(',')}${
+ downsampledTargetIndex ? `,${downsampledTargetIndex}` : ''
+ }`;
+ log.info(`creating a data view for "${dataViewName}"...`);
+ await indexPatterns.create(
+ {
+ title: dataViewName,
+ timeFieldName: '@timestamp',
+ },
+ { override: true }
+ );
+ await common.navigateToApp('lens');
+ await elasticChart.setNewChartUiDebugFlag(true);
+ // go to the
+ await lens.goToTimeRange(
+ fromTimeForScenarios,
+ moment
+ .utc(toTimeForScenarios, TIME_PICKER_FORMAT)
+ .add(2, 'hour')
+ .format(TIME_PICKER_FORMAT) // consider also new documents
+ );
+ });
+
+ after(async () => {
+ for (const { index, create, mode: indexMode } of indexes) {
+ if (create) {
+ if (indexMode === 'tsdb' || indexMode === 'logsdb') {
+ await dataStreams.deleteDataStream(index);
+ } else {
+ log.info(`deleting the index "${index}"...`);
+ await es.indices.delete({
+ index,
+ });
+ }
+ }
+ // no need to cleant he specific downsample index as everything linked to the stream
+ // is cleaned up automatically
+ }
+ });
+
+ beforeEach(async () => {
+ await lens.switchDataPanelIndexPattern(dataViewName);
+ await lens.removeLayer();
+ });
+
+ testingFn(indexes);
+ });
+ }
+ }
+
+ return { runTestsForEachScenario, fromTimeForScenarios, toTimeForScenarios };
+}
diff --git a/x-pack/test_serverless/functional/test_suites/security/config.cloud_security_posture.agentless.ts b/x-pack/test_serverless/functional/test_suites/security/config.cloud_security_posture.agentless.ts
index 948a418279ac9..692ae096265fb 100644
--- a/x-pack/test_serverless/functional/test_suites/security/config.cloud_security_posture.agentless.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/config.cloud_security_posture.agentless.ts
@@ -6,8 +6,10 @@
*/
import { CLOUD_CREDENTIALS_PACKAGE_VERSION } from '@kbn/cloud-security-posture-plugin/common/constants';
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
import { createTestConfig } from '../../config.base';
+// TODO: Remove the agentless default config once Serverless API is merged and default policy is deleted
export default createTestConfig({
serverlessProject: 'security',
junit: {
@@ -16,13 +18,23 @@ export default createTestConfig({
kbnServerArgs: [
`--xpack.fleet.packages.0.name=cloud_security_posture`,
`--xpack.fleet.packages.0.version=${CLOUD_CREDENTIALS_PACKAGE_VERSION}`,
+ `--xpack.fleet.agentless.enabled=true`,
+ `--xpack.fleet.agents.fleet_server.hosts=["https://ftr.kibana:8220"]`,
+ `--xpack.fleet.internal.fleetServerStandalone=true`,
- // Agentless Configuration based on Serverless Security Dev Yaml - config/serverless.security.dev.yml
- `--xpack.fleet.enableExperimental.0=agentless`,
+ // Agentless Configuration based on Serverless Default policy`,
`--xpack.fleet.agentPolicies.0.id=agentless`,
`--xpack.fleet.agentPolicies.0.name=agentless`,
`--xpack.fleet.agentPolicies.0.package_policies=[]`,
`--xpack.cloud.serverless.project_id=some_fake_project_id`,
+ `--xpack.fleet.agentPolicies.0.is_default=true`,
+ `--xpack.fleet.agentPolicies.0.is_default_fleet_server=true`,
+
+ // Serverless Agentless API
+ `--xpack.fleet.agentless.api.url=http://localhost:8089`,
+ `--xpack.fleet.agentless.api.tls.certificate=${KBN_CERT_PATH}`,
+ `--xpack.fleet.agentless.api.tls.key=${KBN_KEY_PATH}`,
+ `--xpack.fleet.agentless.api.tls.ca=${CA_CERT_PATH}`,
],
// load tests in the index file
testFiles: [require.resolve('./ftr/cloud_security_posture/agentless')],
diff --git a/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_aws.ts b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_aws.ts
index 6adbbac3cdc57..90991304936ea 100644
--- a/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_aws.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_aws.ts
@@ -6,9 +6,11 @@
*/
import { CLOUD_CREDENTIALS_PACKAGE_VERSION } from '@kbn/cloud-security-posture-plugin/common/constants';
import expect from '@kbn/expect';
-
+import * as http from 'http';
import type { FtrProviderContext } from '../../../../../ftr_provider_context';
+import { setupMockServer } from '../agentless_api/mock_agentless_api';
export default function ({ getPageObjects, getService }: FtrProviderContext) {
+ const mockAgentlessApiService = setupMockServer();
const pageObjects = getPageObjects([
'settings',
'common',
@@ -24,9 +26,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
let cisIntegration: typeof pageObjects.cisAddIntegration;
let cisIntegrationAws: typeof pageObjects.cisAddIntegration.cisAws;
let testSubjectIds: typeof pageObjects.cisAddIntegration.testSubjectIds;
+ let mockApiServer: http.Server;
const previousPackageVersion = '1.9.0';
before(async () => {
+ mockApiServer = mockAgentlessApiService.listen(8089);
await pageObjects.svlCommonPage.loginAsAdmin();
cisIntegration = pageObjects.cisAddIntegration;
cisIntegrationAws = pageObjects.cisAddIntegration.cisAws;
@@ -41,6 +45,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
.set('kbn-xsrf', 'xxxx')
.send({ force: true })
.expect(200);
+ mockApiServer.close();
});
describe('Serverless - Agentless CIS_AWS Single Account Launch Cloud formation', () => {
@@ -110,7 +115,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});
});
- describe('Serverless - Agentless CIS_AWS edit flow', () => {
+ // TODO: Migrate test after Serverless default agentless policy is deleted.
+ describe.skip('Serverless - Agentless CIS_AWS edit flow', () => {
it(`user should save and edit agentless integration policy`, async () => {
const newDirectAccessKeyId = `newDirectAccessKey`;
@@ -142,7 +148,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
).to.be('true');
});
});
-
// FLAKY: https://github.com/elastic/kibana/issues/191017
describe.skip('Serverless - Agentless CIS_AWS Create flow', () => {
it(`user should save agentless integration policy when there are no api or validation errors and button is not disabled`, async () => {
diff --git a/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_gcp.ts b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_gcp.ts
index cd9e5b2168d1a..85a45f67bf9cc 100644
--- a/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_gcp.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_gcp.ts
@@ -7,7 +7,9 @@
import expect from '@kbn/expect';
import { CLOUD_CREDENTIALS_PACKAGE_VERSION } from '@kbn/cloud-security-posture-plugin/common/constants';
+import * as http from 'http';
import type { FtrProviderContext } from '../../../../../ftr_provider_context';
+import { setupMockServer } from '../agentless_api/mock_agentless_api';
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const pageObjects = getPageObjects(['common', 'svlCommonPage', 'cisAddIntegration', 'header']);
@@ -21,7 +23,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
let cisIntegrationGcp: typeof pageObjects.cisAddIntegration.cisGcp;
let testSubjectIds: typeof pageObjects.cisAddIntegration.testSubjectIds;
+ const mockAgentlessApiService = setupMockServer();
+ let mockApiServer: http.Server;
+
before(async () => {
+ mockApiServer = mockAgentlessApiService.listen(8089);
await pageObjects.svlCommonPage.loginAsAdmin();
cisIntegration = pageObjects.cisAddIntegration;
cisIntegrationGcp = pageObjects.cisAddIntegration.cisGcp;
@@ -36,6 +42,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
.set('kbn-xsrf', 'xxxx')
.send({ force: true })
.expect(200);
+ mockApiServer.close();
});
describe('Agentless CIS_GCP Single Account Launch Cloud shell', () => {
@@ -93,7 +100,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});
});
- describe('Serverless - Agentless CIS_GCP edit flow', () => {
+ describe.skip('Serverless - Agentless CIS_GCP edit flow', () => {
it(`user should save and edit agentless integration policy`, async () => {
const newCredentialsJSON = 'newJson';
await cisIntegration.createAgentlessIntegration({
diff --git a/yarn.lock b/yarn.lock
index acedd70e165ec..ac4dfd08d254d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2590,287 +2590,299 @@
dependencies:
is-negated-glob "^1.0.0"
-"@hapi/accept@^5.0.1", "@hapi/accept@^5.0.2":
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.2.tgz#ab7043b037e68b722f93f376afb05e85c0699523"
- integrity sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==
+"@hapi/accept@^6.0.1", "@hapi/accept@^6.0.3":
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-6.0.3.tgz#eef0800a4f89cd969da8e5d0311dc877c37279ab"
+ integrity sha512-p72f9k56EuF0n3MwlBNThyVE5PXX40g+aQh+C/xbKrfzahM2Oispv3AXmOIU51t3j77zay1qrX7IIziZXspMlw==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/hoek" "9.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/ammo@5.x.x", "@hapi/ammo@^5.0.1":
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/@hapi/ammo/-/ammo-5.0.1.tgz#9d34560f5c214eda563d838c01297387efaab490"
- integrity sha512-FbCNwcTbnQP4VYYhLNGZmA76xb2aHg9AMPiy18NZyWMG310P5KdFGyA9v2rm5ujrIny77dEEIkMOwl0Xv+fSSA==
+"@hapi/ammo@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/ammo/-/ammo-6.0.1.tgz#1bc9f7102724ff288ca03b721854fc5393ad123a"
+ integrity sha512-pmL+nPod4g58kXrMcsGLp05O2jF4P2Q3GiL8qYV7nKYEh3cGf+rV4P5Jyi2Uq0agGhVU63GtaSAfBEZOlrJn9w==
dependencies:
- "@hapi/hoek" "9.x.x"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/b64@5.x.x":
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/b64/-/b64-5.0.0.tgz#b8210cbd72f4774985e78569b77e97498d24277d"
- integrity sha512-ngu0tSEmrezoiIaNGG6rRvKOUkUuDdf4XTPnONHGYfSGRmDqPZX5oJL6HAdKTo1UQHECbdB4OzhWrfgVppjHUw==
+"@hapi/b64@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/b64/-/b64-6.0.1.tgz#786b47dc070e14465af49e2428c1025bd06ed3df"
+ integrity sha512-ZvjX4JQReUmBheeCq+S9YavcnMMHWqx3S0jHNXWIM1kQDxB9cyfSycpVvjfrKcIS8Mh5N3hmu/YKo4Iag9g2Kw==
dependencies:
- "@hapi/hoek" "9.x.x"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/boom@9.x.x", "@hapi/boom@^9.0.0", "@hapi/boom@^9.1.0", "@hapi/boom@^9.1.4":
- version "9.1.4"
- resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6"
- integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==
+"@hapi/boom@^10.0.0", "@hapi/boom@^10.0.1":
+ version "10.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-10.0.1.tgz#ebb14688275ae150aa6af788dbe482e6a6062685"
+ integrity sha512-ERcCZaEjdH3OgSJlyjVk8pHIFeus91CjKP3v+MpgBNp5IvGzP2l/bRiD78nqYcKPaZdbKkK5vDBVPd2ohHBlsA==
dependencies:
- "@hapi/hoek" "9.x.x"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/bounce@2.x.x", "@hapi/bounce@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/bounce/-/bounce-2.0.0.tgz#e6ef56991c366b1e2738b2cd83b01354d938cf3d"
- integrity sha512-JesW92uyzOOyuzJKjoLHM1ThiOvHPOLDHw01YV8yh5nCso7sDwJho1h0Ad2N+E62bZyz46TG3xhAi/78Gsct6A==
+"@hapi/bounce@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/bounce/-/bounce-3.0.1.tgz#25a51bf95733749c557c6bf948048bffa66435e4"
+ integrity sha512-G+/Pp9c1Ha4FDP+3Sy/Xwg2O4Ahaw3lIZFSX+BL4uWi64CmiETuZPxhKDUD4xBMOUZbBlzvO8HjiK8ePnhBadA==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/hoek" "9.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/bourne@2.x.x":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.0.0.tgz#5bb2193eb685c0007540ca61d166d4e1edaf918d"
- integrity sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg==
+"@hapi/bourne@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-3.0.0.tgz#f11fdf7dda62fe8e336fa7c6642d9041f30356d7"
+ integrity sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==
-"@hapi/call@^8.0.0":
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/@hapi/call/-/call-8.0.1.tgz#9e64cd8ba6128eb5be6e432caaa572b1ed8cd7c0"
- integrity sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g==
+"@hapi/call@^9.0.1":
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/call/-/call-9.0.1.tgz#569b87d5b67abf0e58fb82a3894a61aaed3ca92e"
+ integrity sha512-uPojQRqEL1GRZR4xXPqcLMujQGaEpyVPRyBlD8Pp5rqgIwLhtveF9PkixiKru2THXvuN8mUrLeet5fqxKAAMGg==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/hoek" "9.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/catbox-memory@^5.0.0":
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/catbox-memory/-/catbox-memory-5.0.0.tgz#6c18dad1a80737480d1c33bfbefd5d028deec86d"
- integrity sha512-ByuxVJPHNaXwLzbBv4GdTr6ccpe1nG+AfYt+8ftDWEJY7EWBWzD+Klhy5oPTDGzU26pNUh1e7fcYI1ILZRxAXQ==
+"@hapi/catbox-memory@^6.0.2":
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/@hapi/catbox-memory/-/catbox-memory-6.0.2.tgz#399fa83e85134d45a548eee978e4c3c1523e1a70"
+ integrity sha512-H1l4ugoFW/ZRkqeFrIo8p1rWN0PA4MDTfu4JmcoNDvnY975o29mqoZblqFTotxNHlEkMPpIiIBJTV+Mbi+aF0g==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/hoek" "9.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/catbox@^11.1.1":
- version "11.1.1"
- resolved "https://registry.yarnpkg.com/@hapi/catbox/-/catbox-11.1.1.tgz#d277e2d5023fd69cddb33d05b224ea03065fec0c"
- integrity sha512-u/8HvB7dD/6X8hsZIpskSDo4yMKpHxFd7NluoylhGrL6cUfYxdQPnvUp9YU2C6F9hsyBVLGulBd9vBN1ebfXOQ==
+"@hapi/catbox@^12.1.1":
+ version "12.1.1"
+ resolved "https://registry.yarnpkg.com/@hapi/catbox/-/catbox-12.1.1.tgz#9339dca0a5b18b3ca0a825ac5dfc916dbc5bab83"
+ integrity sha512-hDqYB1J+R0HtZg4iPH3LEnldoaBsar6bYp0EonBmNQ9t5CO+1CqgCul2ZtFveW1ReA5SQuze9GPSU7/aecERhw==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/hoek" "9.x.x"
- "@hapi/podium" "4.x.x"
- "@hapi/validate" "1.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/podium" "^5.0.0"
+ "@hapi/validate" "^2.0.1"
-"@hapi/content@^5.0.2":
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/@hapi/content/-/content-5.0.2.tgz#ae57954761de570392763e64cdd75f074176a804"
- integrity sha512-mre4dl1ygd4ZyOH3tiYBrOUBzV7Pu/EOs8VLGf58vtOEECWed8Uuw6B4iR9AN/8uQt42tB04qpVaMyoMQh0oMw==
+"@hapi/content@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@hapi/content/-/content-6.0.0.tgz#2427af3bac8a2f743512fce2a70cbdc365af29df"
+ integrity sha512-CEhs7j+H0iQffKfe5Htdak5LBOz/Qc8TRh51cF+BFv0qnuph3Em4pjGVzJMkI2gfTDdlJKWJISGWS1rK34POGA==
dependencies:
- "@hapi/boom" "9.x.x"
+ "@hapi/boom" "^10.0.0"
-"@hapi/cookie@^11.0.2":
- version "11.0.2"
- resolved "https://registry.yarnpkg.com/@hapi/cookie/-/cookie-11.0.2.tgz#7169c060157a3541146b976e5f0ca9b3f7577d7f"
- integrity sha512-LRpSuHC53urzml83c5eUHSPPt7YtK1CaaPZU9KmnhZlacVVojrWJzOUIcwOADDvCZjDxowCO3zPMaOqzEm9kgg==
+"@hapi/cookie@^12.0.1":
+ version "12.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/cookie/-/cookie-12.0.1.tgz#7e4da17f9843a01732a5aa875592c1aa8c6bed05"
+ integrity sha512-TpykARUIgTBvgbsgtYe5CrM/7XBGms2/22JD3N6dzct6bG1vcOC6pH1JWIos1O5zvQnyDSJ2pnaFk+DToHkAng==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/bounce" "2.x.x"
- "@hapi/hoek" "9.x.x"
- "@hapi/validate" "1.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/bounce" "^3.0.1"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/validate" "^2.0.1"
-"@hapi/cryptiles@5.x.x":
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/@hapi/cryptiles/-/cryptiles-5.1.0.tgz#655de4cbbc052c947f696148c83b187fc2be8f43"
- integrity sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA==
+"@hapi/cryptiles@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/cryptiles/-/cryptiles-6.0.1.tgz#7868a9d4233567ed66f0a9caf85fdcc56e980621"
+ integrity sha512-9GM9ECEHfR8lk5ASOKG4+4ZsEzFqLfhiryIJ2ISePVB92OHLp/yne4m+zn7z9dgvM98TLpiFebjDFQ0UHcqxXQ==
dependencies:
- "@hapi/boom" "9.x.x"
-
-"@hapi/file@2.x.x":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/file/-/file-2.0.0.tgz#2ecda37d1ae9d3078a67c13b7da86e8c3237dfb9"
- integrity sha512-WSrlgpvEqgPWkI18kkGELEZfXr0bYLtr16iIN4Krh9sRnzBZN6nnWxHFxtsnP684wueEySBbXPDg/WfA9xJdBQ==
+ "@hapi/boom" "^10.0.1"
-"@hapi/h2o2@^9.1.0":
- version "9.1.0"
- resolved "https://registry.yarnpkg.com/@hapi/h2o2/-/h2o2-9.1.0.tgz#b223f4978b6f2b0d7d9db10a84a567606c4c3551"
- integrity sha512-B7E58bMhxmpiDI22clxTexoAaVShNBk1Ez6S8SQjQZu5FxxD6Tqa44sXeZQBtWrdJF7ZRbsY60/C8AHLRxagNA==
- dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/hoek" "9.x.x"
- "@hapi/validate" "1.x.x"
- "@hapi/wreck" "17.x.x"
-
-"@hapi/hapi@^20.2.2":
- version "20.2.2"
- resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.2.2.tgz#5810efbf5c0aad367932e86d4066d82ac817e98c"
- integrity sha512-crhU6TIKt7QsksWLYctDBAXogk9PYAm7UzdpETyuBHC2pCa6/+B5NykiOVLG/3FCIgHo/raPVtan8bYtByHORQ==
- dependencies:
- "@hapi/accept" "^5.0.1"
- "@hapi/ammo" "^5.0.1"
- "@hapi/boom" "^9.1.0"
- "@hapi/bounce" "^2.0.0"
- "@hapi/call" "^8.0.0"
- "@hapi/catbox" "^11.1.1"
- "@hapi/catbox-memory" "^5.0.0"
- "@hapi/heavy" "^7.0.1"
- "@hapi/hoek" "^9.0.4"
- "@hapi/mimos" "^6.0.0"
- "@hapi/podium" "^4.1.1"
- "@hapi/shot" "^5.0.5"
- "@hapi/somever" "^3.0.0"
- "@hapi/statehood" "^7.0.4"
- "@hapi/subtext" "^7.0.3"
- "@hapi/teamwork" "^5.1.1"
- "@hapi/topo" "^5.0.0"
- "@hapi/validate" "^1.1.1"
-
-"@hapi/heavy@^7.0.1":
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/@hapi/heavy/-/heavy-7.0.1.tgz#73315ae33b6e7682a0906b7a11e8ca70e3045874"
- integrity sha512-vJ/vzRQ13MtRzz6Qd4zRHWS3FaUc/5uivV2TIuExGTM9Qk+7Zzqj0e2G7EpE6KztO9SalTbiIkTh7qFKj/33cA==
+"@hapi/file@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@hapi/file/-/file-3.0.0.tgz#f1fd824493ac89a6fceaf89c824afc5ae2121c09"
+ integrity sha512-w+lKW+yRrLhJu620jT3y+5g2mHqnKfepreykvdOcl9/6up8GrQQn+l3FRTsjHTKbkbfQFkuksHpdv2EcpKcJ4Q==
+
+"@hapi/h2o2@^10.0.4":
+ version "10.0.4"
+ resolved "https://registry.yarnpkg.com/@hapi/h2o2/-/h2o2-10.0.4.tgz#9255328f851fcc6e647af68d5e0f464523a19133"
+ integrity sha512-dvD8+Y/Okc0fh0blqaYCLIrcy0+1LqIhMr7hjk8elLQZ9mkw2hKFB9dFKuRfWf+1nvHpGlW+PwccqkdebynQbg==
+ dependencies:
+ "@hapi/boom" "^10.0.1"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/validate" "^2.0.1"
+ "@hapi/wreck" "^18.0.1"
+
+"@hapi/hapi@^21.1.0", "@hapi/hapi@^21.3.10":
+ version "21.3.10"
+ resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-21.3.10.tgz#0357db7ca49415e50e5df80ba50ad3964f2a62f3"
+ integrity sha512-CmEcmTREW394MaGGKvWpoOK4rG8tKlpZLs30tbaBzhCrhiL2Ti/HARek9w+8Ya4nMBGcd+kDAzvU44OX8Ms0Jg==
+ dependencies:
+ "@hapi/accept" "^6.0.1"
+ "@hapi/ammo" "^6.0.1"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/bounce" "^3.0.1"
+ "@hapi/call" "^9.0.1"
+ "@hapi/catbox" "^12.1.1"
+ "@hapi/catbox-memory" "^6.0.2"
+ "@hapi/heavy" "^8.0.1"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/mimos" "^7.0.1"
+ "@hapi/podium" "^5.0.1"
+ "@hapi/shot" "^6.0.1"
+ "@hapi/somever" "^4.1.1"
+ "@hapi/statehood" "^8.1.1"
+ "@hapi/subtext" "^8.1.0"
+ "@hapi/teamwork" "^6.0.0"
+ "@hapi/topo" "^6.0.1"
+ "@hapi/validate" "^2.0.1"
+
+"@hapi/heavy@^8.0.1":
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/heavy/-/heavy-8.0.1.tgz#e2be4a6a249005b5a587f7604aafa8ed02461fb6"
+ integrity sha512-gBD/NANosNCOp6RsYTsjo2vhr5eYA3BEuogk6cxY0QdhllkkTaJFYtTXv46xd6qhBVMbMMqcSdtqey+UQU3//w==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/hoek" "9.x.x"
- "@hapi/validate" "1.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/validate" "^2.0.1"
+
+"@hapi/hoek@^11.0.2", "@hapi/hoek@^11.0.4":
+ version "11.0.4"
+ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-11.0.4.tgz#42a7f244fd3dd777792bfb74b8c6340ae9182f37"
+ integrity sha512-PnsP5d4q7289pS2T2EgGz147BFJ2Jpb4yrEdkpz2IhgEUzos1S7HTl7ezWh1yfYzYlj89KzLdCRkqsP6SIryeQ==
-"@hapi/hoek@9.x.x", "@hapi/hoek@^9.0.0", "@hapi/hoek@^9.0.4", "@hapi/hoek@^9.2.1", "@hapi/hoek@^9.3.0":
+"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
version "9.3.0"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
-"@hapi/inert@^6.0.4":
- version "6.0.4"
- resolved "https://registry.yarnpkg.com/@hapi/inert/-/inert-6.0.4.tgz#0544221eabc457110a426818358d006e70ff1f41"
- integrity sha512-tpmNqtCCAd+5Ts07bJmMaA79+ZUIf0zSWnQMaWtbcO4nGrO/yXB2AzoslfzFX2JEV9vGeF3FfL8mYw0pHl8VGg==
+"@hapi/inert@^7.1.0":
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/inert/-/inert-7.1.0.tgz#0bcebe4c5115230f9d7b5d6e8c3bf799ca91958e"
+ integrity sha512-5X+cl/Ozm0U9uPGGX1dSKhnhTQIf161bH/kkTN9OBVAZKFG+nrj8j/NMj6S1zBBZWmQrkVRNPfCUGrXzB4fCFQ==
+ dependencies:
+ "@hapi/ammo" "^6.0.1"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/bounce" "^3.0.1"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/validate" "^2.0.1"
+ lru-cache "^7.14.1"
+
+"@hapi/iron@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/iron/-/iron-7.0.1.tgz#f74bace8dad9340c7c012c27c078504f070f14b5"
+ integrity sha512-tEZnrOujKpS6jLKliyWBl3A9PaE+ppuL/+gkbyPPDb/l2KSKQyH4lhMkVb+sBhwN+qaxxlig01JRqB8dk/mPxQ==
dependencies:
- "@hapi/ammo" "5.x.x"
- "@hapi/boom" "9.x.x"
- "@hapi/bounce" "2.x.x"
- "@hapi/hoek" "9.x.x"
- "@hapi/validate" "1.x.x"
- lru-cache "^6.0.0"
+ "@hapi/b64" "^6.0.1"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/bourne" "^3.0.0"
+ "@hapi/cryptiles" "^6.0.1"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/iron@6.x.x", "@hapi/iron@^6.0.0":
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/iron/-/iron-6.0.0.tgz#ca3f9136cda655bdd6028de0045da0de3d14436f"
- integrity sha512-zvGvWDufiTGpTJPG1Y/McN8UqWBu0k/xs/7l++HVU535NLHXsHhy54cfEMdW7EjwKfbBfM9Xy25FmTiobb7Hvw==
+"@hapi/mimos@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/mimos/-/mimos-7.0.1.tgz#5b65c76bb9da28ba34b0092215891f2c72bc899d"
+ integrity sha512-b79V+BrG0gJ9zcRx1VGcCI6r6GEzzZUgiGEJVoq5gwzuB2Ig9Cax8dUuBauQCFKvl2YWSWyOc8mZ8HDaJOtkew==
dependencies:
- "@hapi/b64" "5.x.x"
- "@hapi/boom" "9.x.x"
- "@hapi/bourne" "2.x.x"
- "@hapi/cryptiles" "5.x.x"
- "@hapi/hoek" "9.x.x"
+ "@hapi/hoek" "^11.0.2"
+ mime-db "^1.52.0"
-"@hapi/mimos@^6.0.0":
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/mimos/-/mimos-6.0.0.tgz#daa523d9c07222c7e8860cb7c9c5501fd6506484"
- integrity sha512-Op/67tr1I+JafN3R3XN5DucVSxKRT/Tc+tUszDwENoNpolxeXkhrJ2Czt6B6AAqrespHoivhgZBWYSuANN9QXg==
+"@hapi/nigel@^5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/nigel/-/nigel-5.0.1.tgz#a6dfe357e9d48d944e2ffc552bd95cb701d79ee9"
+ integrity sha512-uv3dtYuB4IsNaha+tigWmN8mQw/O9Qzl5U26Gm4ZcJVtDdB1AVJOwX3X5wOX+A07qzpEZnOMBAm8jjSqGsU6Nw==
dependencies:
- "@hapi/hoek" "9.x.x"
- mime-db "1.x.x"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/vise" "^5.0.1"
-"@hapi/nigel@4.x.x":
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/@hapi/nigel/-/nigel-4.0.2.tgz#8f84ef4bca4fb03b2376463578f253b0b8e863c4"
- integrity sha512-ht2KoEsDW22BxQOEkLEJaqfpoKPXxi7tvabXy7B/77eFtOyG5ZEstfZwxHQcqAiZhp58Ae5vkhEqI03kawkYNw==
+"@hapi/pez@^6.1.0":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/pez/-/pez-6.1.0.tgz#64d9f95580fc7d8f1d13437ee4a8676709954fda"
+ integrity sha512-+FE3sFPYuXCpuVeHQ/Qag1b45clR2o54QoonE/gKHv9gukxQ8oJJZPR7o3/ydDTK6racnCJXxOyT1T93FCJMIg==
dependencies:
- "@hapi/hoek" "^9.0.4"
- "@hapi/vise" "^4.0.0"
+ "@hapi/b64" "^6.0.1"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/content" "^6.0.0"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/nigel" "^5.0.1"
-"@hapi/pez@^5.0.1":
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/@hapi/pez/-/pez-5.0.3.tgz#b75446e6fef8cbb16816573ab7da1b0522e7a2a1"
- integrity sha512-mpikYRJjtrbJgdDHG/H9ySqYqwJ+QU/D7FXsYciS9P7NYBXE2ayKDAy3H0ou6CohOCaxPuTV4SZ0D936+VomHA==
+"@hapi/podium@^5.0.0", "@hapi/podium@^5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/podium/-/podium-5.0.1.tgz#f292b4c0ca3118747394a102c6c3340bda96662f"
+ integrity sha512-eznFTw6rdBhAijXFIlBOMJJd+lXTvqbrBIS4Iu80r2KTVIo4g+7fLy4NKp/8+UnSt5Ox6mJtAlKBU/Sf5080TQ==
dependencies:
- "@hapi/b64" "5.x.x"
- "@hapi/boom" "9.x.x"
- "@hapi/content" "^5.0.2"
- "@hapi/hoek" "9.x.x"
- "@hapi/nigel" "4.x.x"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/teamwork" "^6.0.0"
+ "@hapi/validate" "^2.0.1"
-"@hapi/podium@4.x.x", "@hapi/podium@^4.1.1", "@hapi/podium@^4.1.3":
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/@hapi/podium/-/podium-4.1.3.tgz#91e20838fc2b5437f511d664aabebbb393578a26"
- integrity sha512-ljsKGQzLkFqnQxE7qeanvgGj4dejnciErYd30dbrYzUOF/FyS/DOF97qcrT3bhoVwCYmxa6PEMhxfCPlnUcD2g==
+"@hapi/shot@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-6.0.1.tgz#ea84d1810b7c8599d5517c23b4ec55a529d7dc16"
+ integrity sha512-s5ynMKZXYoDd3dqPw5YTvOR/vjHvMTxc388+0qL0jZZP1+uwXuUD32o9DuuuLsmTlyXCWi02BJl1pBpwRuUrNA==
dependencies:
- "@hapi/hoek" "9.x.x"
- "@hapi/teamwork" "5.x.x"
- "@hapi/validate" "1.x.x"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/validate" "^2.0.1"
-"@hapi/shot@^5.0.5":
- version "5.0.5"
- resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-5.0.5.tgz#a25c23d18973bec93c7969c51bf9579632a5bebd"
- integrity sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A==
+"@hapi/somever@^4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@hapi/somever/-/somever-4.1.1.tgz#b492c78408303c72cd1a39c5060f35d18a404b27"
+ integrity sha512-lt3QQiDDOVRatS0ionFDNrDIv4eXz58IibQaZQDOg4DqqdNme8oa0iPWcE0+hkq/KTeBCPtEOjDOBKBKwDumVg==
dependencies:
- "@hapi/hoek" "9.x.x"
- "@hapi/validate" "1.x.x"
+ "@hapi/bounce" "^3.0.1"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/somever@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/somever/-/somever-3.0.0.tgz#f4e9b16a948415b926b4dd898013602b0cb45758"
- integrity sha512-Upw/kmKotC9iEmK4y047HMYe4LDKsE5NWfjgX41XNKmFvxsQL7OiaCWVhuyyhU0ShDGBfIAnCH8jZr49z/JzZA==
- dependencies:
- "@hapi/bounce" "2.x.x"
- "@hapi/hoek" "9.x.x"
-
-"@hapi/statehood@^7.0.4":
- version "7.0.4"
- resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-7.0.4.tgz#6acb9d0817b5c657089356f7d9fd60af0bce4f41"
- integrity sha512-Fia6atroOVmc5+2bNOxF6Zv9vpbNAjEXNcUbWXavDqhnJDlchwUUwKS5LCi5mGtCTxRhUKKHwuxuBZJkmLZ7fw==
- dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/bounce" "2.x.x"
- "@hapi/bourne" "2.x.x"
- "@hapi/cryptiles" "5.x.x"
- "@hapi/hoek" "9.x.x"
- "@hapi/iron" "6.x.x"
- "@hapi/validate" "1.x.x"
-
-"@hapi/subtext@^7.0.3":
- version "7.0.3"
- resolved "https://registry.yarnpkg.com/@hapi/subtext/-/subtext-7.0.3.tgz#f7440fc7c966858e1f39681e99eb6171c71e7abd"
- integrity sha512-CekDizZkDGERJ01C0+TzHlKtqdXZxzSWTOaH6THBrbOHnsr3GY+yiMZC+AfNCypfE17RaIakGIAbpL2Tk1z2+A==
- dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/bourne" "2.x.x"
- "@hapi/content" "^5.0.2"
- "@hapi/file" "2.x.x"
- "@hapi/hoek" "9.x.x"
- "@hapi/pez" "^5.0.1"
- "@hapi/wreck" "17.x.x"
-
-"@hapi/teamwork@5.x.x", "@hapi/teamwork@^5.1.1":
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-5.1.1.tgz#4d2ba3cac19118a36c44bf49a3a47674de52e4e4"
- integrity sha512-1oPx9AE5TIv+V6Ih54RP9lTZBso3rP8j4Xhb6iSVwPXtAM+sDopl5TFMv5Paw73UnpZJ9gjcrTE1BXrWt9eQrg==
+"@hapi/statehood@^8.1.1":
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-8.1.1.tgz#db4bd14c90810a1389763cb0b0b8f221aa4179c1"
+ integrity sha512-YbK7PSVUA59NArAW5Np0tKRoIZ5VNYUicOk7uJmWZF6XyH5gGL+k62w77SIJb0AoAJ0QdGQMCQ/WOGL1S3Ydow==
+ dependencies:
+ "@hapi/boom" "^10.0.1"
+ "@hapi/bounce" "^3.0.1"
+ "@hapi/bourne" "^3.0.0"
+ "@hapi/cryptiles" "^6.0.1"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/iron" "^7.0.1"
+ "@hapi/validate" "^2.0.1"
+
+"@hapi/subtext@^8.1.0":
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/subtext/-/subtext-8.1.0.tgz#58733020a6655bc4d978df9e2f75e31696ff3f91"
+ integrity sha512-PyaN4oSMtqPjjVxLny1k0iYg4+fwGusIhaom9B2StinBclHs7v46mIW706Y+Wo21lcgulGyXbQrmT/w4dus6ww==
+ dependencies:
+ "@hapi/boom" "^10.0.1"
+ "@hapi/bourne" "^3.0.0"
+ "@hapi/content" "^6.0.0"
+ "@hapi/file" "^3.0.0"
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/pez" "^6.1.0"
+ "@hapi/wreck" "^18.0.1"
+
+"@hapi/teamwork@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-6.0.0.tgz#b3a173cf811ba59fc6ee22318a1b51f4561f06e0"
+ integrity sha512-05HumSy3LWfXpmJ9cr6HzwhAavrHkJ1ZRCmNE2qJMihdM5YcWreWPfyN0yKT2ZjCM92au3ZkuodjBxOibxM67A==
-"@hapi/topo@^5.0.0", "@hapi/topo@^5.1.0":
+"@hapi/topo@^5.1.0":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
dependencies:
"@hapi/hoek" "^9.0.0"
-"@hapi/validate@1.x.x", "@hapi/validate@^1.1.1", "@hapi/validate@^1.1.3":
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/@hapi/validate/-/validate-1.1.3.tgz#f750a07283929e09b51aa16be34affb44e1931ad"
- integrity sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA==
+"@hapi/topo@^6.0.1":
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-6.0.2.tgz#f219c1c60da8430228af4c1f2e40c32a0d84bbb4"
+ integrity sha512-KR3rD5inZbGMrHmgPxsJ9dbi6zEK+C3ZwUwTa+eMwWLz7oijWUTWD2pMSNNYJAU6Qq+65NkxXjqHr/7LM2Xkqg==
dependencies:
- "@hapi/hoek" "^9.0.0"
- "@hapi/topo" "^5.0.0"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/vise@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/vise/-/vise-4.0.0.tgz#c6a94fe121b94a53bf99e7489f7fcc74c104db02"
- integrity sha512-eYyLkuUiFZTer59h+SGy7hUm+qE9p+UemePTHLlIWppEd+wExn3Df5jO04bFQTm7nleF5V8CtuYQYb+VFpZ6Sg==
+"@hapi/validate@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/validate/-/validate-2.0.1.tgz#45cf228c4c8cfc61ba2da7e0a5ba93ff3b9afff1"
+ integrity sha512-NZmXRnrSLK8MQ9y/CMqE9WSspgB9xA41/LlYR0k967aSZebWr4yNrpxIbov12ICwKy4APSlWXZga9jN5p6puPA==
+ dependencies:
+ "@hapi/hoek" "^11.0.2"
+ "@hapi/topo" "^6.0.1"
+
+"@hapi/vise@^5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@hapi/vise/-/vise-5.0.1.tgz#5c9f16bcf1c039ddd4b6cad5f32d71eeb6bb7dac"
+ integrity sha512-XZYWzzRtINQLedPYlIkSkUr7m5Ddwlu99V9elh8CSygXstfv3UnWIXT0QD+wmR0VAG34d2Vx3olqcEhRRoTu9A==
dependencies:
- "@hapi/hoek" "9.x.x"
+ "@hapi/hoek" "^11.0.2"
-"@hapi/wreck@17.x.x", "@hapi/wreck@^17.0.0", "@hapi/wreck@^17.1.0":
- version "17.1.0"
- resolved "https://registry.yarnpkg.com/@hapi/wreck/-/wreck-17.1.0.tgz#fbdc380c6f3fa1f8052dc612b2d3b6ce3e88dbec"
- integrity sha512-nx6sFyfqOpJ+EFrHX+XWwJAxs3ju4iHdbB/bwR8yTNZOiYmuhA8eCe7lYPtYmb4j7vyK/SlbaQsmTtUrMvPEBw==
+"@hapi/wreck@^18.0.1", "@hapi/wreck@^18.1.0":
+ version "18.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/wreck/-/wreck-18.1.0.tgz#68e631fc7568ebefc6252d5b86cb804466c8dbe6"
+ integrity sha512-0z6ZRCmFEfV/MQqkQomJ7sl/hyxvcZM7LtuVqN3vdAO4vM9eBbowl0kaqQj9EJJQab+3Uuh1GxbGIBFy4NfJ4w==
dependencies:
- "@hapi/boom" "9.x.x"
- "@hapi/bourne" "2.x.x"
- "@hapi/hoek" "9.x.x"
+ "@hapi/boom" "^10.0.1"
+ "@hapi/bourne" "^3.0.0"
+ "@hapi/hoek" "^11.0.2"
"@hello-pangea/dnd@16.6.0", "@hello-pangea/dnd@^16.6.0":
version "16.6.0"
@@ -5883,6 +5895,10 @@
version "0.0.0"
uid ""
+"@kbn/observability-synthetics-test-data@link:x-pack/packages/observability/synthetics_test_data":
+ version "0.0.0"
+ uid ""
+
"@kbn/observability-utils@link:x-pack/packages/observability/observability_utils":
version "0.0.0"
uid ""
@@ -10533,63 +10549,14 @@
"@types/vinyl-fs" "*"
chokidar "^2.1.2"
-"@types/hapi__catbox@*":
- version "10.2.3"
- resolved "https://registry.yarnpkg.com/@types/hapi__catbox/-/hapi__catbox-10.2.3.tgz#c9279c16d709bf2987491c332e11d18124ae018f"
- integrity sha512-gs6MKMKXzWpSqeYsPaDIDAxD8jLNg7aFxgAJE6Jnc+ns072Z9fuh39/NF5gSk1KNoGCLnIpeZ0etT9gY9QDCKg==
-
-"@types/hapi__cookie@^10.1.3":
- version "10.1.3"
- resolved "https://registry.yarnpkg.com/@types/hapi__cookie/-/hapi__cookie-10.1.3.tgz#b0ab2be28669e083c63253927262c43f24395c2c"
- integrity sha512-v/hPXxOVfBdkTa+S4cGec88vZjvEbLaZp8xjg2MtjDhykx1/mLtY4EJHk6fI1cW5WGgFV9pgMjz5mOktjNwILw==
- dependencies:
- "@types/hapi__hapi" "*"
- joi "^17.3.0"
-
-"@types/hapi__h2o2@^8.3.3":
- version "8.3.3"
- resolved "https://registry.yarnpkg.com/@types/hapi__h2o2/-/hapi__h2o2-8.3.3.tgz#f6c5ac480a6fd421025f7d0f78dfa916703511b7"
- integrity sha512-+qWZVFVGc5Y0wuNZvVe876VJjUBCJ8eQdXovg4Rg9laHpeERQejluI7aw31xXWfLojTuHz3ThZzC6Orqras05Q==
- dependencies:
- "@hapi/boom" "^9.0.0"
- "@hapi/wreck" "^17.0.0"
- "@types/hapi__hapi" "*"
- "@types/node" "*"
-
-"@types/hapi__hapi@*", "@types/hapi__hapi@^20.0.9":
- version "20.0.9"
- resolved "https://registry.yarnpkg.com/@types/hapi__hapi/-/hapi__hapi-20.0.9.tgz#9d570846c96268266a14c970c13aeeaccfc8e172"
- integrity sha512-fGpKScknCKZityRXdZgpCLGbm41R1ppFgnKHerfZlqOOlCX/jI129S6ghgBqkqCE8m9A0CIu1h7Ch04lD9KOoA==
- dependencies:
- "@hapi/boom" "^9.0.0"
- "@hapi/iron" "^6.0.0"
- "@hapi/podium" "^4.1.3"
- "@types/hapi__catbox" "*"
- "@types/hapi__mimos" "*"
- "@types/hapi__shot" "*"
- "@types/node" "*"
- joi "^17.3.0"
-
-"@types/hapi__inert@^5.2.3":
- version "5.2.3"
- resolved "https://registry.yarnpkg.com/@types/hapi__inert/-/hapi__inert-5.2.3.tgz#f586eb240d5997c9968d1b4e8b37679517045ca1"
- integrity sha512-I1mWQrEc7oMqGtofT0rwBgRBCBurz0wNzbq8QZsHWR+aXM0bk1j9GA6zwyGIeO53PNl2C1c2kpXlc084xCV+Tg==
- dependencies:
- "@types/hapi__hapi" "*"
-
-"@types/hapi__mimos@*":
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/@types/hapi__mimos/-/hapi__mimos-4.1.0.tgz#47dbf89ebfc05183c1de2797e9426793db9a0d85"
- integrity sha512-hcdSoYa32wcP+sEfyf85ieGwElwokcZ/mma8eyqQ4OTHeCAGwfaoiGxjG4z1Dm+RGhIYLHlW54ji5FFwahH12A==
- dependencies:
- "@types/mime-db" "*"
-
-"@types/hapi__shot@*":
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/@types/hapi__shot/-/hapi__shot-4.1.1.tgz#c760322b90eb77f36a3003a442e8dc69e6ae3922"
- integrity sha512-44Jj7jJAFgNVgfdbyVtBUbEIbYqWRKAbLR4kiQxBbVEdf8ZKfa5Hg1qg4QdzXBgjw0mopewU4wx1/eWRTVelNQ==
+"@types/hapi__cookie@^12.0.5":
+ version "12.0.5"
+ resolved "https://registry.yarnpkg.com/@types/hapi__cookie/-/hapi__cookie-12.0.5.tgz#b28e885043d1951721ed4d8ef2087943b8b8267d"
+ integrity sha512-rZNcJRDuutoSLHVHNSoIACabeGZEhjYFKqdW9vmucpUgE50YfPbtGPREzXEKOf2/1RR6d+jrSkNRwxUEaUIfsQ==
dependencies:
+ "@hapi/hapi" "^21.1.0"
"@types/node" "*"
+ joi "^17.7.0"
"@types/has-ansi@^3.0.0":
version "3.0.0"
@@ -10876,11 +10843,6 @@
dependencies:
"@types/braces" "*"
-"@types/mime-db@*":
- version "1.27.0"
- resolved "https://registry.yarnpkg.com/@types/mime-db/-/mime-db-1.27.0.tgz#9bc014a1fd1fdf47649c1a54c6dd7966b8284792"
- integrity sha1-m8AUof0f30dknBpUxt15ZrgoR5I=
-
"@types/mime-types@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73"
@@ -13613,13 +13575,13 @@ brfs@^2.0.0, brfs@^2.0.2:
static-module "^3.0.2"
through2 "^2.0.0"
-brok@^5.0.2:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/brok/-/brok-5.0.2.tgz#b77e7203ce89d30939a5b877a9bb3acb4dffc848"
- integrity sha512-mqsoOGPjcP9oltC8dD4PnRCiJREmFg+ee588mVYZgZNd8YV5Zo6eOLv/fp6HxdYffaxvkKfPHjc+sRWIkuIu7A==
+brok@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/brok/-/brok-6.0.0.tgz#82f081de7a180802c224955cb6c2888b81a27b28"
+ integrity sha512-z5ND+K0+Go4Doiq8GtEMuBicbbky2DSbNzrRqEnOFYJgqrSu85nK2HsczCRwd7UznHTSUVYEkuEpRm5HtfaCSw==
dependencies:
- "@hapi/hoek" "^9.0.4"
- "@hapi/validate" "^1.1.3"
+ "@hapi/hoek" "^11.0.4"
+ "@hapi/validate" "^2.0.1"
brorand@^1.0.1, brorand@^1.1.0:
version "1.1.0"
@@ -21637,7 +21599,7 @@ joi-to-json@^4.3.0:
lodash "^4.17.21"
semver-compare "^1.0.0"
-joi@^17.13.3, joi@^17.3.0:
+joi@^17.13.3, joi@^17.7.0:
version "17.13.3"
resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
@@ -23271,11 +23233,16 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.51.0, mime-db@1.x.x, "mime-db@>= 1.40.0 < 2":
+mime-db@1.51.0:
version "1.51.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+"mime-db@>= 1.40.0 < 2", mime-db@^1.52.0:
+ version "1.53.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447"
+ integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==
+
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
version "2.1.34"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"