Skip to content

[Entity Store] Use last_seen for automated resolution watermark #258574

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
maxcold merged 10 commits into from
Mar 24, 2026
Merged

[Entity Store] Use last_seen for automated resolution watermark #258574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
776712d
common fields: update first_seen & last_seen to use @timestamp
kubasobon Mar 19, 2026
67a6dc8
test: update snapshots
kubasobon Mar 19, 2026
899e99b
common fields: restore last_activity and add last_seen
kubasobon Mar 19, 2026
43dd5c1
test: update snapshots
kubasobon Mar 19, 2026
d787b13
Merge branch 'main' into entity-store-lifecycle
kubasobon Mar 19, 2026
2cbcec9
Merge remote-tracking branch 'origin/main' into maxcold/watermark-las…
maxcold Mar 19, 2026
2e83a19
Use entity.lifecycle.last_seen for automated resolution watermark
maxcold Mar 19, 2026
dbc3084
Merge remote-tracking branch 'origin/main' into maxcold/watermark-las…
maxcold Mar 23, 2026
81b52ee
Merge branch 'main' into maxcold/watermark-last-seen
maxcold Mar 23, 2026
dd21d01
Merge branch 'main' into maxcold/watermark-last-seen
maxcold Mar 24, 2026
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
14 changes: 9 additions & 5 deletions ...curity/plugins/entity_store/server/maintainers/automated_resolution/__tests__/run.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,10 @@ describe('Automated Resolution', () => {

const step1Query = mockEsClient.search.mock.calls[0][0] as any;
const filters = step1Query.query.bool.filter;
const hasTimestampFilter = filters.some((f: any) => f.range && f.range['@timestamp']);
expect(hasTimestampFilter).toBe(false);
const hasLastSeenFilter = filters.some(
(f: any) => f.range && f.range['entity.lifecycle.last_seen']
);
expect(hasLastSeenFilter).toBe(false);
});

it('should include timestamp range filter for incremental scan', async () => {
Expand All @@ -153,9 +155,11 @@ describe('Automated Resolution', () => {

const step1Query = mockEsClient.search.mock.calls[0][0] as any;
const filters = step1Query.query.bool.filter;
const timestampFilter = filters.find((f: any) => f.range && f.range['@timestamp']);
expect(timestampFilter).toEqual({
range: { '@timestamp': { gt: '2026-03-09T00:00:00Z' } },
const lastSeenFilter = filters.find(
(f: any) => f.range && f.range['entity.lifecycle.last_seen']
);
expect(lastSeenFilter).toEqual({
range: { 'entity.lifecycle.last_seen': { gt: '2026-03-09T00:00:00Z' } },
});
});

Expand Down
6 changes: 4 additions & 2 deletions ...ck/solutions/security/plugins/entity_store/server/maintainers/automated_resolution/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ async function collectNewEmailValues(
];

if (state.lastProcessedTimestamp) {
filters.push({ range: { '@timestamp': { gt: state.lastProcessedTimestamp } } });
filters.push({
range: { 'entity.lifecycle.last_seen': { gt: state.lastProcessedTimestamp } },
});
}

do {
Expand All @@ -137,7 +139,7 @@ async function collectNewEmailValues(
...(afterKey ? { after: afterKey } : {}),
},
},
max_timestamp: { max: { field: '@timestamp' } },
max_timestamp: { max: { field: 'entity.lifecycle.last_seen' } },
},
});

Expand Down
Loading