Skip to content

[SecuritySolution] Finishing touches on the alert prevalence #128295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janmonschke merged 6 commits into from
Mar 24, 2022
Merged

[SecuritySolution] Finishing touches on the alert prevalence #128295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a40ab7f
copy: sentence-case alert prevalence
janmonschke Mar 22, 2022
3c38cc4
copy: render empty value placeholder in case of an error
janmonschke Mar 22, 2022
f4e5264
feat: add source event id to highlighted fields
janmonschke Mar 22, 2022
0d677dd
copy: re-add the empty space for spacing
janmonschke Mar 22, 2022
e2f321f
chore: use defaultToEmptyTag in favor of getEmptyValue
janmonschke Mar 24, 2022
2cc6906
Merge branch 'main' into security/alert-prevalence-refinement
kibanamachine Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions x-pack/plugins/security_solution/public/common/components/event_details/__mocks__/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,12 @@ export const mockAlertDetailsData = [
values: ['2020-11-25T15:36:40.924914552Z'],
originalValue: '2020-11-25T15:36:40.924914552Z',
},
{
category: 'kibana',
field: 'kibana.alert.original_event.id',
values: ['f7bc2422-cb1e-4427-ba33-6f496ee8360c'],
originalValue: 'f7bc2422-cb1e-4427-ba33-6f496ee8360c',
},
{
category: 'kibana',
field: 'kibana.alert.original_event.code',
Expand Down
2 changes: 1 addition & 1 deletion ...gins/security_solution/public/common/components/event_details/alert_summary_view.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('AlertSummaryView', () => {
</TestProviders>
);

['host.name', 'user.name', 'Rule type', 'query'].forEach((fieldId) => {
['host.name', 'user.name', 'Rule type', 'query', 'Source event id'].forEach((fieldId) => {
expect(getByText(fieldId));
});
});
Expand Down
1 change: 1 addition & 0 deletions ...ugins/security_solution/public/common/components/event_details/get_alert_summary_rows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const alwaysDisplayedFields: EventSummaryField[] = [
{ id: 'agent.id', overrideField: AGENT_STATUS_FIELD_NAME, label: i18n.AGENT_STATUS },
{ id: 'user.name' },
{ id: ALERT_RULE_TYPE, label: i18n.RULE_TYPE },
{ id: 'kibana.alert.original_event.id', label: i18n.SOURCE_EVENT_ID },
];

/**
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/common/components/event_details/summary_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const summaryColumns: Array<EuiBasicTableColumn<AlertSummaryRow>> = [
<EuiIconTip
type="iInCircle"
color="subdued"
title="Alert Prevalence"
Copy link
Copy Markdown
Contributor Author

@janmonschke janmonschke Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michaelolo24 I assume this one was forgotten in the initial PR. Let me know if we should keep the English copy here.

Copy link
Copy Markdown
Contributor

@michaelolo24 michaelolo24 Mar 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, thanks! I missed this translation.

title={i18n.HIGHLIGHTED_FIELDS_ALERT_PREVALENCE}
content={<span>{i18n.HIGHLIGHTED_FIELDS_ALERT_PREVALENCE_TOOLTIP}</span>}
/>
</>
Expand Down
6 changes: 4 additions & 2 deletions ...s/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { EventFieldsData } from '../types';
import { TimelineId } from '../../../../../common/types';
import { AlertSummaryRow } from '../helpers';
import { useAlertPrevalence } from '../../../containers/alerts/use_alert_prevalence';
import { getEmptyValue } from '../../../components/empty_value';

jest.mock('../../../lib/kibana');
jest.mock('../../../containers/alerts/use_alert_prevalence', () => ({
Expand Down Expand Up @@ -75,10 +76,10 @@ describe('PrevalenceCellRenderer', () => {
});

describe('When an error was returned', () => {
test('it should return null', async () => {
test('it should return empty value placeholder', async () => {
mockUseAlertPrevalence.mockImplementation(() => ({
loading: false,
count: 123,
count: undefined,
error: true,
}));
const { container } = render(
Expand All @@ -88,6 +89,7 @@ describe('PrevalenceCellRenderer', () => {
);
expect(container.getElementsByClassName('euiLoadingSpinner')).toHaveLength(0);
expect(screen.queryByText('123')).toBeNull();
expect(screen.queryByText(getEmptyValue())).toBeTruthy();
});
});

Expand Down
9 changes: 4 additions & 5 deletions ...lugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ import React from 'react';
import { EuiLoadingSpinner } from '@elastic/eui';

import { AlertSummaryRow } from '../helpers';
import { defaultToEmptyTag } from '../../../components/empty_value';
import { useAlertPrevalence } from '../../../containers/alerts/use_alert_prevalence';

const PrevalenceCell = React.memo<AlertSummaryRow['description']>(
({ data, values, timelineId }) => {
const { loading, count, error } = useAlertPrevalence({
const { loading, count } = useAlertPrevalence({
field: data.field,
timelineId,
value: values,
Expand All @@ -22,11 +23,9 @@ const PrevalenceCell = React.memo<AlertSummaryRow['description']>(

if (loading) {
return <EuiLoadingSpinner />;
} else if (error) {
return null;
} else {
return defaultToEmptyTag(count);
}

return <>{count}</>;
}
);

Expand Down
9 changes: 8 additions & 1 deletion x-pack/plugins/security_solution/public/common/components/event_details/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const HIGHLIGHTED_FIELDS_VALUE = i18n.translate(
export const HIGHLIGHTED_FIELDS_ALERT_PREVALENCE = i18n.translate(
'xpack.securitySolution.alertDetails.overview.highlightedFields.alertPrevalence',
{
defaultMessage: 'Alert Prevalence',
defaultMessage: 'Alert prevalence',
}
);

Expand Down Expand Up @@ -117,6 +117,13 @@ export const RULE_TYPE = i18n.translate('xpack.securitySolution.detections.alert
defaultMessage: 'Rule type',
});

export const SOURCE_EVENT_ID = i18n.translate(
'xpack.securitySolution.detections.alerts.sourceEventId',
{
defaultMessage: 'Source event id',
}
);

export const MULTI_FIELD_TOOLTIP = i18n.translate(
'xpack.securitySolution.eventDetails.multiFieldTooltipContent',
{
Expand Down