Skip to content

[9.1] [Synthetics] Include timestamp range filter to exclude frozen tier !! (#230375) #230669

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
kibanamachine merged 1 commit into from
Aug 5, 2025
Merged

[9.1] [Synthetics] Include timestamp range filter to exclude frozen tier !! (#230375) #230669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions x-pack/solutions/observability/plugins/synthetics/common/requests/get_certs_request_body.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@

import type { estypes } from '@elastic/elasticsearch';
import DateMath from '@kbn/datemath';
import { EXCLUDE_RUN_ONCE_FILTER, FINAL_SUMMARY_FILTER } from '../constants/client_defaults';
import {
EXCLUDE_RUN_ONCE_FILTER,
FINAL_SUMMARY_FILTER,
getRangeFilter,
} from '../constants/client_defaults';
import type { CertificatesResults } from '../../server/queries/get_certs';
import { CertResult, GetCertsParams, Ping } from '../runtime_types';
import { createEsQuery } from '../utils/es_search';
Expand Down Expand Up @@ -46,7 +50,7 @@ export const getCertsRequestBody = ({
}: GetCertsParams) => {
const sort = SortFields[sortBy as keyof typeof SortFields];

const searchRequest = createEsQuery({
return createEsQuery({
from: (pageIndex ?? 0) * size,
size,
sort: asMutableArray([
Expand Down Expand Up @@ -88,6 +92,11 @@ export const getCertsRequestBody = ({
field: 'tls.server.hash.sha256',
},
},
// fetch large enough date range to cover the last 7 days, no particular reason for 7 days
getRangeFilter({
from: 'now-7d',
to: 'now',
}),
{
range: {
'monitor.timespan': {
Expand Down Expand Up @@ -172,8 +181,6 @@ export const getCertsRequestBody = ({
},
},
});

return searchRequest;
};

export const processCertsResult = (result: CertificatesResults): CertResult => {
Expand Down
9 changes: 9 additions & 0 deletions x-pack/solutions/observability/plugins/uptime/common/constants/client_defaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,12 @@ export const getTimeSpanFilter = () => ({
},
},
});

export const getRangeFilter = ({ from, to }: { from: string; to: string }) => ({
range: {
'@timestamp': {
gte: from,
lte: to,
},
},
});
10 changes: 9 additions & 1 deletion x-pack/solutions/observability/plugins/uptime/common/requests/get_certs_request_body.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@

import type { estypes } from '@elastic/elasticsearch';
import DateMath from '@kbn/datemath';
import { EXCLUDE_RUN_ONCE_FILTER, SUMMARY_FILTER } from '../constants/client_defaults';
import {
EXCLUDE_RUN_ONCE_FILTER,
SUMMARY_FILTER,
getRangeFilter,
} from '../constants/client_defaults';
import { CertResult, GetCertsParams, Ping } from '../runtime_types';
import { createEsQuery } from '../utils/es_search';

Expand Down Expand Up @@ -88,6 +92,10 @@ export const getCertsRequestBody = ({
field: 'tls.server.hash.sha256',
},
},
getRangeFilter({
from: 'now-7d',
to: 'now',
}),
{
range: {
'monitor.timespan': {
Expand Down
8 changes: 8 additions & 0 deletions ...olutions/observability/plugins/uptime/server/legacy_uptime/lib/requests/get_certs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,14 @@ describe('getCerts', () => {
"field": "tls.server.hash.sha256",
},
},
Object {
"range": Object {
"@timestamp": Object {
"gte": "now-7d",
"lte": "now",
},
},
},
Object {
"range": Object {
"monitor.timespan": Object {
Expand Down