Skip to content
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

Jump to bottom

[Fleet] Use unmapped_type: long and missing: 0 when sorting datasets that don't include event.ingested #136114

Merged
merged 10 commits into from
Jul 14, 2022
Merged

[Fleet] Use unmapped_type: long and missing: 0 when sorting datasets that don't include event.ingested #136114

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
ab5206c
Add ignore_unmapped: true to fix data streams API in e2e tests
kpollich Jul 11, 2022
dceec04
Fix sort setup
kpollich Jul 11, 2022
2187368
Merge branch 'main' into fix-data-streams-api-for-e2e-tests
kibanamachine Jul 11, 2022
a48425d
Skip failing cypress suite for now
kpollich Jul 12, 2022
7e07c5d
Filter out non-integration data streams from Fleet data streams API
kpollich Jul 12, 2022
dfefbbf
Merge branch 'main' into fix-data-streams-api-for-e2e-tests
kpollich Jul 13, 2022
ce09f35
Try using timestamp instead of event.ingested
kpollich Jul 13, 2022
92182ef
Merge branch 'main' into fix-data-streams-api-for-e2e-tests
kpollich Jul 14, 2022
26a89ce
Use unmapped type setting
kpollich Jul 14, 2022
4b2ed43
Provide explicit missing value for event.ingested
kpollich Jul 14, 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
2 changes: 1 addition & 1 deletion x-pack/plugins/fleet/cypress/cypress.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"baseUrl": "http://localhost:5620",
"defaultCommandTimeout": 60000,
"requestTimeout": 60000,
"responseTimetout": 60000,
"responseTimeout": 60000,
"execTimeout": 120000,
"pageLoadTimeout": 120000,
"nodeVersion": "system",
Expand Down
15 changes: 14 additions & 1 deletion x-pack/plugins/fleet/server/routes/data_streams/get_data_streams_query_metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,22 @@ export async function getDataStreamsQueryMetadata({
esClient.search({
size: 1,
index: dataStreamName,
sort: 'event.ingested:desc',
_source: false,
fields: ['event.ingested'],
// We need to use `body` to control the `sort` value here, because otherwise
// it's just appended as a query string to the search operation and we can't
// set `unmapped_type` for cases where `event.ingested` is not defiend, e.g.
// in custom logs or custom HTTPJSON integrations
body: {
sort: {
'event.ingested': {
order: 'desc',
// Necessary because of https://github.com/elastic/elasticsearch/issues/81960
missing: 0,
unmapped_type: 'long',
},
},
},
}),
esClient.termsEnum({
index: dataStreamName,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export const getListHandler: RequestHandler = async (context, request, response)
});

// Return final data streams objects sorted by last activity, descending
// After filtering out data streams that are missing dataset/namespace/type fields
// After filtering out data streams that are missing dataset/namespace/type/package fields
body.data_streams = (await Promise.all(dataStreamPromises))
.filter(({ dataset, namespace, type }) => dataset && namespace && type)
.sort((a, b) => b.last_activity_ms - a.last_activity_ms);
Expand Down