Skip to content

[EDR Workflows] Fix osquery pack results display when agent clock is skewed #251417

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
szwarckonrad merged 4 commits into from
Feb 10, 2026
Merged

[EDR Workflows] Fix osquery pack results display when agent clock is skewed #251417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb3ea26
Fix osquery pack results display when agent clock is skewed to future
szwarckonrad Feb 3, 2026
4204bd9
Merge branch 'main' into osquery-fix-future-timestamp-pack-results
szwarckonrad Feb 9, 2026
f05c152
Address review: remove redundant optional chaining in ternary branches
szwarckonrad Feb 9, 2026
e00a677
Merge branch 'main' into osquery-fix-future-timestamp-pack-results
szwarckonrad Feb 9, 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
10 changes: 5 additions & 5 deletions x-pack/platform/plugins/shared/osquery/public/discover/pack_view_in_discover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ const PackViewInDiscoverActionComponent: React.FC<PackViewInActionProps> = ({ it
interval,
});

const startDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString()
const startDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).subtract(interval, 'seconds').toISOString()
: `now-${interval}s`;
const endDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).toISOString()
const endDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).toISOString()
: 'now';

return (
Expand All @@ -40,7 +40,7 @@ const PackViewInDiscoverActionComponent: React.FC<PackViewInActionProps> = ({ it
buttonType={ViewResultsActionButtonType.icon}
startDate={startDate}
endDate={endDate}
mode={lastResultsData?.['@timestamp'][0] ? 'absolute' : 'relative'}
mode={lastResultsData?.lastResultTime ? 'absolute' : 'relative'}
/>
);
};
Expand Down
10 changes: 5 additions & 5 deletions x-pack/platform/plugins/shared/osquery/public/lens/pack_view_in_lens.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ const PackViewInLensActionComponent: React.FC<PackViewInActionProps> = ({ item }
interval,
});

const startDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString()
const startDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).subtract(interval, 'seconds').toISOString()
: `now-${interval}s`;
const endDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).toISOString()
const endDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).toISOString()
: 'now';

return (
Expand All @@ -40,7 +40,7 @@ const PackViewInLensActionComponent: React.FC<PackViewInActionProps> = ({ item }
buttonType={ViewResultsActionButtonType.icon}
startDate={startDate}
endDate={endDate}
mode={lastResultsData?.['@timestamp'][0] ? 'absolute' : 'relative'}
mode={lastResultsData?.lastResultTime ? 'absolute' : 'relative'}
/>
);
};
Expand Down
22 changes: 11 additions & 11 deletions x-pack/platform/plugins/shared/osquery/public/packs/pack_queries_status_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ const ScheduledQueryLastResults: React.FC<ScheduledQueryLastResultsProps> = ({
});

const timestamp = useMemo(() => {
const dateTime = lastResultsData?.['@timestamp'];
const dateTime = lastResultsData?.lastResultTime;
if (!dateTime) return undefined;

return Array.isArray(dateTime) ? dateTime[0] : dateTime;
Expand Down Expand Up @@ -522,11 +522,11 @@ const PackViewInDiscoverActionComponent: React.FC<PackViewInActionProps> = ({ it
interval,
});

const startDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString()
const startDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).subtract(interval, 'seconds').toISOString()
: `now-${interval}s`;
const endDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).toISOString()
const endDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).toISOString()
: 'now';

return (
Expand All @@ -535,7 +535,7 @@ const PackViewInDiscoverActionComponent: React.FC<PackViewInActionProps> = ({ it
buttonType={ViewResultsActionButtonType.icon}
startDate={startDate}
endDate={endDate}
mode={lastResultsData?.['@timestamp'][0] ? 'absolute' : 'relative'}
mode={lastResultsData?.lastResultTime ? 'absolute' : 'relative'}
/>
);
};
Expand All @@ -550,11 +550,11 @@ const PackViewInLensActionComponent: React.FC<PackViewInActionProps> = ({ item,
interval,
});

const startDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString()
const startDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).subtract(interval, 'seconds').toISOString()
: `now-${interval}s`;
const endDate = lastResultsData?.['@timestamp']
? moment(lastResultsData?.['@timestamp'][0]).toISOString()
const endDate = lastResultsData?.lastResultTime
? moment(lastResultsData.lastResultTime[0]).toISOString()
: 'now';

return (
Expand All @@ -563,7 +563,7 @@ const PackViewInLensActionComponent: React.FC<PackViewInActionProps> = ({ item,
buttonType={ViewResultsActionButtonType.icon}
startDate={startDate}
endDate={endDate}
mode={lastResultsData?.['@timestamp'][0] ? 'absolute' : 'relative'}
mode={lastResultsData?.lastResultTime ? 'absolute' : 'relative'}
/>
);
};
Expand Down
16 changes: 9 additions & 7 deletions x-pack/platform/plugins/shared/osquery/public/packs/use_pack_query_last_results.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const usePackQueryLastResults = ({
async () => {
const lastResultsSearchSource = await data.search.searchSource.create({
size: 1,
sort: [{ '@timestamp': SortDirection.desc }],
sort: [{ 'event.ingested': SortDirection.desc }],
query: {
// @ts-expect-error update types
bool: {
Expand All @@ -54,9 +54,10 @@ export const usePackQueryLastResults = ({
lastResultsSearchSource.setField('index', logsDataView);

const lastResultsResponse = await lastValueFrom(lastResultsSearchSource.fetch$());
const timestamp = lastResultsResponse.rawResponse?.hits?.hits[0]?.fields?.['@timestamp'][0];
const eventIngested =
lastResultsResponse.rawResponse?.hits?.hits[0]?.fields?.['event.ingested']?.[0];

if (timestamp) {
if (eventIngested) {
const aggsSearchSource = await data.search.searchSource.create({
size: 1,
query: {
Expand All @@ -65,11 +66,11 @@ export const usePackQueryLastResults = ({
filter: [
{
range: {
'@timestamp': {
'event.ingested': {
gte: startDate
? moment(startDate).format()
: moment(timestamp).subtract(interval, 'seconds').format(),
lte: moment(endDate || timestamp).format(),
: moment(eventIngested).subtract(interval, 'seconds').format(),
lte: moment(endDate || eventIngested).format(),
},
},
},
Expand All @@ -90,7 +91,8 @@ export const usePackQueryLastResults = ({
const aggsResponse = await lastValueFrom(aggsSearchSource.fetch$());

return {
'@timestamp': lastResultsResponse.rawResponse?.hits?.hits[0]?.fields?.['@timestamp'],
lastResultTime:
lastResultsResponse.rawResponse?.hits?.hits[0]?.fields?.['event.ingested'],
// @ts-expect-error update types
uniqueAgentsCount: aggsResponse?.rawResponse.aggregations?.unique_agents?.value,
docCount: aggsResponse?.rawResponse?.hits?.total,
Expand Down
Loading