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

[eem] stats by metadata #204137

Closed
wants to merge 3 commits into from
Closed

[eem] stats by metadata #204137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99985ad
stats by metadata
klacabane Dec 12, 2024
18d09b1
Merge branch 'main' into eem-improve-metadata-aggs
klacabane Dec 13, 2024
008c9ec
Merge branch 'main' into eem-improve-metadata-aggs
klacabane Dec 13, 2024
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
5 changes: 3 additions & 2 deletions x-pack/platform/plugins/shared/entity_manager/server/lib/v2/queries/entity_instances.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ describe('getEntityInstancesQuery', () => {

expect(query).toEqual(
'FROM logs-*, metrics-* | ' +
'STATS host.name = TOP(host.name::keyword, 10, "ASC"), entity.last_seen_timestamp = MAX(custom_timestamp_field), service.id = MAX(service.id::keyword) BY service.name::keyword | ' +
'RENAME `service.name::keyword` AS service.name | ' +
'STATS custom_timestamp_field = MAX(custom_timestamp_field) BY service.name::keyword, host.name::keyword, service.id::keyword | ' +
'RENAME `service.name::keyword` AS service.name, `host.name::keyword` AS host.name, `service.id::keyword` AS service.id | ' +
'STATS host.name = TOP(host.name, 10, "ASC"), entity.last_seen_timestamp = MAX(custom_timestamp_field), service.id = MAX(service.id) BY service.name | ' +
'EVAL entity.type = "service", entity.id = service.name, entity.display_name = COALESCE(service.id, entity.id) | ' +
'SORT entity.id DESC | ' +
'LIMIT 5'
Expand Down
29 changes: 24 additions & 5 deletions x-pack/platform/plugins/shared/entity_manager/server/lib/v2/queries/entity_instances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import { uniq } from 'lodash';
import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
import { asKeyword } from './utils';
import { EntitySourceDefinition, SortBy } from '../types';
Expand Down Expand Up @@ -43,10 +44,22 @@ const dslFilter = ({
return toElasticsearchQuery(fromKueryExpression(kuery));
};

const groupBy = ({ source }: { source: EntitySourceDefinition }) => {
const fields = [
...source.identity_fields,
...source.metadata_fields,
...(source.display_name ? [source.display_name] : []),
];

return `STATS${
source.timestamp_field ? ` ${source.timestamp_field} = MAX(${source.timestamp_field})` : ''
} BY ${fields.map(asKeyword).join(', ')}`;
};

const statsCommand = ({ source }: { source: EntitySourceDefinition }) => {
const aggs = source.metadata_fields
.filter((field) => !source.identity_fields.some((idField) => idField === field))
.map((field) => `${field} = TOP(${asKeyword(field)}, 10, "ASC")`);
.map((field) => `${field} = TOP(${field}, 10, "ASC")`);

if (source.timestamp_field) {
aggs.push(`entity.last_seen_timestamp = MAX(${source.timestamp_field})`);
Expand All @@ -55,14 +68,19 @@ const statsCommand = ({ source }: { source: EntitySourceDefinition }) => {
if (source.display_name) {
// ideally we want the latest value but there's no command yet
// so we use MAX for now
aggs.push(`${source.display_name} = MAX(${asKeyword(source.display_name)})`);
aggs.push(`${source.display_name} = MAX(${source.display_name})`);
}

return `STATS ${aggs.join(', ')} BY ${source.identity_fields.map(asKeyword).join(', ')}`;
return `STATS ${aggs.join(', ')} BY ${source.identity_fields.join(', ')}`;
};

const renameCommand = ({ source }: { source: EntitySourceDefinition }) => {
const operations = source.identity_fields.map((field) => `\`${asKeyword(field)}\` AS ${field}`);
const operations = uniq([
...source.identity_fields,
...source.metadata_fields,
...(source.display_name ? [source.display_name] : []),
]).map((field) => `\`${asKeyword(field)}\` AS ${field}`);

return `RENAME ${operations.join(', ')}`;
};

Expand Down Expand Up @@ -110,8 +128,9 @@ export function getEntityInstancesQuery({
}) {
const commands = [
fromCommand({ source }),
statsCommand({ source }),
groupBy({ source }),
renameCommand({ source }),
statsCommand({ source }),
evalCommand({ source }),
sortCommand({ source, sort }),
`LIMIT ${limit}`,
Expand Down