Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
d3b3ba6
init routes for template timeline
angorayc Apr 8, 2020
8a05dd9
create template timeline
angorayc Apr 9, 2020
79d53c8
Merge remote-tracking branch 'upstream/master' into template-timeline
angorayc Apr 9, 2020
99f0da5
add create/update timelines route
angorayc Apr 15, 2020
5a9b6ac
update api entry point
angorayc Apr 15, 2020
91798ee
fix types
angorayc Apr 15, 2020
dcae730
add template type
angorayc Apr 15, 2020
086996a
Merge remote-tracking branch 'upstream/master' into template-timeline
angorayc Apr 16, 2020
cab3e60
fix types
angorayc Apr 16, 2020
a33cbb6
add types and template timeline id
angorayc Apr 16, 2020
8243614
fix types
angorayc Apr 16, 2020
89f2b12
update import timeline to handle template timeline
angorayc Apr 16, 2020
464ee77
unit test
angorayc Apr 17, 2020
3a37628
sudo code
XavierM Apr 17, 2020
9bb3552
remove class for savedobject
angorayc Apr 20, 2020
aba9d8e
add template timeline version
angorayc Apr 20, 2020
e26a803
clean up arguments
angorayc Apr 20, 2020
5351219
fix types for framework request
XavierM Apr 20, 2020
7584715
show filter in find
XavierM Apr 20, 2020
d120d73
fix create template timeline
angorayc Apr 20, 2020
7aeb123
update mock data
angorayc Apr 20, 2020
7416fca
handle missing timeline when exporting
angorayc Apr 21, 2020
4b93431
update the order for timeline routes
angorayc Apr 21, 2020
3c51485
update schemas
angorayc Apr 21, 2020
c17ea0c
Merge remote-tracking branch 'upstream/master' into template-timeline
angorayc Apr 21, 2020
b94159f
Merge remote-tracking branch 'upstream/master' into template-timeline
angorayc Apr 21, 2020
0a7b275
move type to common folder so we can re-use them on UI and server side
XavierM Apr 21, 2020
0f22a03
fix types + integrate persist with epic timeline
XavierM Apr 21, 2020
bebb133
update all timeline when persit timeline
XavierM Apr 21, 2020
785ec34
add timeline api readme
angorayc Apr 22, 2020
2abe09b
fix validation error
angorayc Apr 22, 2020
7d0bdba
WIP
patrykkopycinski Apr 22, 2020
4c6f3cd
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 22, 2020
8707b34
fix unit test
angorayc Apr 22, 2020
5739461
WIP
patrykkopycinski Apr 23, 2020
9d3ca28
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 23, 2020
b7fa77a
Merge remote-tracking branch 'upstream/master' into template-timeline
angorayc Apr 23, 2020
42aa10d
WIP
patrykkopycinski Apr 23, 2020
916cdbc
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 23, 2020
1ac461d
cleanup
patrykkopycinski Apr 23, 2020
d0f2330
cleanup
patrykkopycinski Apr 23, 2020
148102f
fix types
patrykkopycinski Apr 23, 2020
f96316b
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 24, 2020
b3df5ef
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 24, 2020
9b31985
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 24, 2020
8c56978
Merge branch 'master' into template-timeline
elasticmachine Apr 24, 2020
f892db6
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 27, 2020
be2aea3
display error if unexpected format is given
angorayc Apr 27, 2020
7194dc5
Merge branch 'template-timeline' of github.com:angorayc/kibana into t…
angorayc Apr 27, 2020
21b535e
Merge remote-tracking branch 'upstream/master' into template-timeline
angorayc Apr 27, 2020
b8091b7
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 27, 2020
bd6bd53
draftTimeline
patrykkopycinski Apr 27, 2020
0858797
cleanup
patrykkopycinski Apr 27, 2020
292c35e
Merge branch 'master' into template-timeline
elasticmachine Apr 27, 2020
f90bf21
cleanup
patrykkopycinski Apr 27, 2020
3d59799
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 27, 2020
f106ff4
fix issue with reftech all timeline query
XavierM Apr 27, 2020
a8c0501
fix flashing timeline while refetch
angorayc Apr 28, 2020
d1c851e
Merge branch 'template-timeline' of github.com:angorayc/kibana into t…
angorayc Apr 28, 2020
4eca630
fix types
angorayc Apr 28, 2020
7d3d120
Merge remote-tracking branch 'upstream/master' into template-timeline
angorayc Apr 28, 2020
5315cc7
fix types
angorayc Apr 28, 2020
1995a71
fix dependency
angorayc Apr 28, 2020
6413a11
fix timeline deletion
XavierM Apr 28, 2020
b1d54e7
Merge branch 'template-timeline' of github.com:angorayc/kibana into t…
XavierM Apr 28, 2020
48d43b7
remove redundant dependency
angorayc Apr 28, 2020
afc084a
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 28, 2020
5a6041e
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 28, 2020
3993d5d
add i18n message
angorayc Apr 28, 2020
0dbde7e
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 28, 2020
219f33a
conflicts
patrykkopycinski Apr 28, 2020
d82783a
fix types
patrykkopycinski Apr 28, 2020
184711f
Merge branch 'master' into template-timeline
elasticmachine Apr 28, 2020
fd3a036
Merge branch 'master' into template-timeline
elasticmachine Apr 28, 2020
bdade71
fix unit test
angorayc Apr 29, 2020
cd5823c
Merge branch 'template-timeline' of github.com:angorayc/kibana into f…
patrykkopycinski Apr 29, 2020
71739e1
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 29, 2020
98cad49
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 29, 2020
e098d14
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 29, 2020
3ea0f92
cleanup
patrykkopycinski Apr 29, 2020
75b044e
cleanup
patrykkopycinski Apr 29, 2020
b17a37b
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 29, 2020
c0dab8f
cleanup
patrykkopycinski Apr 29, 2020
95adf01
cleanup
patrykkopycinski Apr 29, 2020
6f3b9b0
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 30, 2020
e743e17
snapshot
patrykkopycinski Apr 30, 2020
255e934
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski Apr 30, 2020
2891d00
cleanup
patrykkopycinski Apr 30, 2020
d78c6f4
unit tests
patrykkopycinski Apr 30, 2020
2cd46d8
cleanup
patrykkopycinski May 4, 2020
49a237d
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 4, 2020
08af528
add missing route
patrykkopycinski May 4, 2020
adb9850
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 4, 2020
bd41923
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 4, 2020
ca2f642
fix fetch
patrykkopycinski May 4, 2020
f7ee393
update es archives timeline data
patrykkopycinski May 4, 2020
3ed4ec6
fix cypress
patrykkopycinski May 4, 2020
c44c858
fix cypress
patrykkopycinski May 4, 2020
ecbf94e
fix cypress
patrykkopycinski May 4, 2020
1fd1ce3
cleanup
patrykkopycinski May 4, 2020
2b7f3f1
fix cypress
patrykkopycinski May 5, 2020
13caeec
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 5, 2020
98e0497
Merge branch 'master' of github.com:elastic/kibana; branch 'feat/siem…
patrykkopycinski May 5, 2020
f28e78a
fix lint
patrykkopycinski May 5, 2020
a486b3d
fix types
patrykkopycinski May 5, 2020
425ec42
PR comments
patrykkopycinski May 5, 2020
e3f5f08
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 5, 2020
905dc51
fix logic
patrykkopycinski May 5, 2020
65d6c52
fix signals timeline table columns
patrykkopycinski May 5, 2020
e535a81
review x
XavierM May 5, 2020
f8cc3ec
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
XavierM May 6, 2020
d92c871
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
XavierM May 6, 2020
2a07837
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 6, 2020
bc9264a
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 6, 2020
90f9c64
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 6, 2020
ac414fc
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 6, 2020
dd2acee
update saved_object.ts
patrykkopycinski May 6, 2020
888f347
fix
patrykkopycinski May 6, 2020
0b928c8
fix cypress
patrykkopycinski May 6, 2020
ce5b0a1
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 6, 2020
5d2a169
fix cypress
patrykkopycinski May 6, 2020
ba53757
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 6, 2020
1d11f14
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 6, 2020
a294fc8
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 7, 2020
3cf3e90
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 7, 2020
dca1ce8
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 7, 2020
73e6958
fix show state
patrykkopycinski May 7, 2020
ddaa25c
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 7, 2020
96ad16e
cleanup
patrykkopycinski May 7, 2020
c100fe3
cleanup
patrykkopycinski May 7, 2020
72b2e53
cleanup
patrykkopycinski May 8, 2020
bbeeaa3
cleanup
patrykkopycinski May 8, 2020
17c3258
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 8, 2020
fe7bd9d
fix lint
patrykkopycinski May 8, 2020
6acea4b
snapshot
patrykkopycinski May 8, 2020
9d5c052
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 8, 2020
737c248
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 8, 2020
9f84cea
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 8, 2020
4ba6d5c
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 8, 2020
64581f7
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 8, 2020
7c744fa
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 11, 2020
91aa552
Merge branch 'master' of github.com:elastic/kibana into feat/siem-unt…
patrykkopycinski May 12, 2020
601b920
fix merge
patrykkopycinski May 12, 2020
075998d
fix imports
patrykkopycinski May 13, 2020
7cdf5e4
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 13, 2020
4c7d785
Merge branch 'master' into feat/siem-untitled-timeline
elasticmachine May 13, 2020
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
1 change: 1 addition & 0 deletions x-pack/plugins/siem/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export const DETECTION_ENGINE_RULES_STATUS_URL = `${DETECTION_ENGINE_RULES_URL}/
export const DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL = `${DETECTION_ENGINE_RULES_URL}/prepackaged/_status`;

export const TIMELINE_URL = '/api/timeline';
export const TIMELINE_DRAFT_URL = `${TIMELINE_URL}/_draft`;
export const TIMELINE_EXPORT_URL = `${TIMELINE_URL}/_export`;
export const TIMELINE_IMPORT_URL = `${TIMELINE_URL}/_import`;

Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/siem/common/types/timeline/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,13 @@ const SavedSortRuntimeType = runtimeTypes.partial({

export enum TimelineType {
default = 'default',
draft = 'draft',
template = 'template',
}

export const TimelineTypeLiteralRt = runtimeTypes.union([
runtimeTypes.literal(TimelineType.template),
runtimeTypes.literal(TimelineType.draft),
runtimeTypes.literal(TimelineType.default),
]);

Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/siem/cypress/tasks/create_new_case.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const createNewCase = (newCase: TestCase) => {
cy.get(INSERT_TIMELINE_BTN).click({ force: true });
cy.get(TIMELINE_SEARCHBOX).type(`${newCase.timeline.title}{enter}`);
cy.get(TIMELINE).should('be.visible');
cy.wait(300);
cy.get(TIMELINE)
.eq(1)
.click({ force: true });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { Props } from './top_n';
import { ACTIVE_TIMELINE_REDUX_ID, StatefulTopN } from '.';

jest.mock('../../lib/kibana');
jest.mock('../../../timelines/store/timeline/actions');

const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/siem/public/common/mock/timeline_results.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2243,7 +2243,7 @@ export const defaultTimelineProps: CreateTimelineProps = {
showRowRenderers: true,
sort: { columnId: '@timestamp', sortDirection: Direction.desc },
title: '',
timelineType: TimelineType.default,
timelineType: TimelineType.draft,
templateTimelineVersion: null,
templateTimelineId: null,
version: null,
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/siem/public/graphql/introspection.json
Original file line number Diff line number Diff line change
Expand Up @@ -10377,6 +10377,7 @@
"isDeprecated": false,
"deprecationReason": null
},
{ "name": "draft", "description": "", "isDeprecated": false, "deprecationReason": null },
{
"name": "template",
"description": "",
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/siem/public/graphql/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ export enum TlsFields {

export enum TimelineType {
default = 'default',
draft = 'draft',
template = 'template',
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const getExportedIds = (selectedTimelines: OpenTimelineResult[]) => {
);
};

export const useEditTimelinBatchActions = ({
export const useEditTimelineBatchActions = ({
deleteTimelines,
selectedItems,
tableRef,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import {
mockTimelineResult,
mockTimelineModel,
} from '../../../common/mock/timeline_results';
import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
import { timelineDefaults } from '../../store/timeline/defaults';
import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../common/store/inputs/actions';
import {
setKqlFilterQueryDraft as dispatchSetKqlFilterQueryDraft,
applyKqlFilterQuery as dispatchApplyKqlFilterQuery,
addTimeline as dispatchAddTimeline,
addNote as dispatchAddGlobalTimelineNote,
} from '../../../timelines/store/timeline/actions';
} from '../../store/timeline/actions';
import {
addNotes as dispatchAddNotes,
updateNote as dispatchUpdateNote,
Expand All @@ -39,7 +39,7 @@ import sinon from 'sinon';
import { TimelineType } from '../../../../common/types/timeline';

jest.mock('../../../common/store/inputs/actions');
jest.mock('../../../timelines/store/timeline/actions');
jest.mock('../../store/timeline/actions');
jest.mock('../../../common/store/app/actions');
jest.mock('uuid', () => {
return {
Expand Down Expand Up @@ -300,7 +300,7 @@ describe('helpers', () => {
sortDirection: 'desc',
},
title: '',
timelineType: TimelineType.default,
timelineType: TimelineType.draft,
templateTimelineId: null,
templateTimelineVersion: null,
version: '1',
Expand Down Expand Up @@ -397,13 +397,14 @@ describe('helpers', () => {
sortDirection: 'desc',
},
title: '',
timelineType: TimelineType.default,
timelineType: TimelineType.draft,
templateTimelineId: null,
templateTimelineVersion: null,
version: '1',
width: 1100,
});
});

test('should merge columns when event.action is deleted without two extra column names of user.name', () => {
const timeline = {
savedObjectId: 'savedObject-1',
Expand All @@ -416,38 +417,80 @@ describe('helpers', () => {
savedObjectId: 'savedObject-1',
columns: [
{
aggregatable: undefined,
category: undefined,
columnHeaderType: 'not-filtered',
description: undefined,
example: undefined,
id: '@timestamp',
placeholder: undefined,
type: undefined,
width: 190,
},
{
aggregatable: undefined,
category: undefined,
columnHeaderType: 'not-filtered',
description: undefined,
example: undefined,
id: 'message',
placeholder: undefined,
type: undefined,
width: 180,
},
{
aggregatable: undefined,
category: undefined,
columnHeaderType: 'not-filtered',
description: undefined,
example: undefined,
id: 'event.category',
placeholder: undefined,
type: undefined,
width: 180,
},
{
aggregatable: undefined,
category: undefined,
columnHeaderType: 'not-filtered',
description: undefined,
example: undefined,
id: 'host.name',
placeholder: undefined,
type: undefined,
width: 180,
},
{
aggregatable: undefined,
category: undefined,
columnHeaderType: 'not-filtered',
description: undefined,
example: undefined,
id: 'source.ip',
placeholder: undefined,
type: undefined,
width: 180,
},
{
aggregatable: undefined,
category: undefined,
columnHeaderType: 'not-filtered',
description: undefined,
example: undefined,
id: 'destination.ip',
placeholder: undefined,
type: undefined,
width: 180,
},
{
aggregatable: undefined,
category: undefined,
columnHeaderType: 'not-filtered',
description: undefined,
example: undefined,
id: 'user.name',
placeholder: undefined,
type: undefined,
width: 180,
},
],
Expand All @@ -474,7 +517,7 @@ describe('helpers', () => {
},
loadingEventIds: [],
title: '',
timelineType: TimelineType.default,
timelineType: TimelineType.draft,
templateTimelineId: null,
templateTimelineVersion: null,
noteIds: [],
Expand Down Expand Up @@ -642,7 +685,7 @@ describe('helpers', () => {
},
loadingEventIds: [],
title: '',
timelineType: TimelineType.default,
timelineType: TimelineType.draft,
templateTimelineId: null,
templateTimelineVersion: null,
noteIds: [],
Expand Down
Loading