Skip to content

[Metrics]Discover] Remove redundant where clause from metric grid charts queries #245155

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −17
Draft

[Metrics]Discover] Remove redundant where clause from metric grid charts queries #245155

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
30 changes: 21 additions & 9 deletions .../packages/shared/kbn-unified-metrics-grid/src/common/utils/esql/create_esql_query.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`host.name\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`host.name\`
`.trim()
);
Expand All @@ -78,7 +77,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`host.name\` IS NOT NULL AND \`container.id\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`host.name\`, \`container.id\`
| EVAL ${DIMENSIONS_COLUMN} = CONCAT(\`host.name\`, " › ", \`container.id\`)
| DROP \`host.name\`, \`container.id\`
Expand All @@ -97,7 +95,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`host.ip\` IS NOT NULL AND \`host.name\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`host.ip\`, \`host.name\`
| EVAL ${DIMENSIONS_COLUMN} = CONCAT(\`host.ip\`::STRING, " › ", \`host.name\`)
| DROP \`host.ip\`, \`host.name\`
Expand All @@ -116,7 +113,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`cpu.cores\` IS NOT NULL AND \`host.name\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`cpu.cores\`, \`host.name\`
| EVAL ${DIMENSIONS_COLUMN} = CONCAT(\`cpu.cores\`::STRING, " › ", \`host.name\`)
| DROP \`cpu.cores\`, \`host.name\`
Expand All @@ -136,7 +132,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`host.ip\` IS NOT NULL AND \`host.name\` IS NOT NULL AND \`cpu.cores\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`host.ip\`, \`host.name\`, \`cpu.cores\`
| EVAL ${DIMENSIONS_COLUMN} = CONCAT(\`host.ip\`::STRING, " › ", \`host.name\`, " › ", \`cpu.cores\`::STRING)
| DROP \`host.ip\`, \`host.name\`, \`cpu.cores\`
Expand Down Expand Up @@ -233,6 +228,27 @@ TS metrics-*
);
});

it('should include WHERE clause when filters are provided with dimensions', () => {
const query = createESQLQuery({
metric: mockMetric,
dimensions: [
{ name: 'host.name', type: ES_FIELD_TYPES.KEYWORD },
{ name: 'container.id', type: ES_FIELD_TYPES.KEYWORD },
],
filters: { 'host.name': ['host-1', 'host-2'] },
});

expect(query).toBe(
`
TS metrics-*
| WHERE \`host.name\`::STRING IN ("host-1", "host-2")
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`host.name\`, \`container.id\`
| EVAL ${DIMENSIONS_COLUMN} = CONCAT(\`host.name\`, " › ", \`container.id\`)
| DROP \`host.name\`, \`container.id\`
`.trim()
);
});

describe('special character escaping', () => {
const mockMetricWithSpecialChars: MetricField = {
name: 'cpu.usage',
Expand All @@ -253,7 +269,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`service-name\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`service-name\`
`.trim()
);
Expand All @@ -270,7 +285,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`service-name\` IS NOT NULL AND \`container-id\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`service-name\`, \`container-id\`
| EVAL ${DIMENSIONS_COLUMN} = CONCAT(\`service-name\`, " › ", \`container-id\`)
| DROP \`service-name\`, \`container-id\`
Expand All @@ -289,7 +303,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`host-ip\` IS NOT NULL AND \`service-name\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`host-ip\`, \`service-name\`
| EVAL ${DIMENSIONS_COLUMN} = CONCAT(\`host-ip\`::STRING, " › ", \`service-name\`)
| DROP \`host-ip\`, \`service-name\`
Expand Down Expand Up @@ -330,7 +343,6 @@ TS metrics-*
expect(query).toBe(
`
TS metrics-*
| WHERE \`field\`\`with\`\`ticks\` IS NOT NULL
| STATS AVG(cpu.usage) BY BUCKET(@timestamp, 100, ?_tstart, ?_tend), \`field\`\`with\`\`ticks\`
`.trim()
);
Expand Down
9 changes: 1 addition & 8 deletions ...tform/packages/shared/kbn-unified-metrics-grid/src/common/utils/esql/create_esql_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,9 @@ export function createESQLQuery({ metric, dimensions = [], filters = {} }: Creat
);
});

const unfilteredDimensions = (dimensions ?? []).filter((dim) => !(dim.name in filters));
const queryPipeline = source.pipe(
...whereConditions,
unfilteredDimensions.length > 0
? where(
unfilteredDimensions
.map((dim) => `${sanitazeESQLInput(dim.name)} IS NOT NULL`)
.join(' AND ')
)
: (query) => query,
(query) => query,
stats(
`${createMetricAggregation({
instrument,
Expand Down