IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Shard query splitting: don't shard metric queries (#96848)

Browse Source
This commit is contained in:
Matias Chomicki 2024-11-21 17:20:48 +00:00 committed by GitHub
parent d5a5edf5a8
commit 30b3fd2864
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/loki/queryUtils.ts
View File

@ -319,7 +319,7 @@ export function requestSupportsSharding(allQueries: LokiQuery[]) {
.filter((query) => query.queryType !== LokiQueryType.Instant) .filter((query) => query.queryType !== LokiQueryType.Instant)
.filter((query) => !query.refId.includes('do-not-shard')) .filter((query) => !query.refId.includes('do-not-shard'))
.filter((query) => query.expr) .filter((query) => query.expr)
.filter((query) => query.direction === LokiQueryDirection.Scan || !isLogsQuery(query.expr)); .filter((query) => query.direction === LokiQueryDirection.Scan && isLogsQuery(query.expr));
return queries.length > 0; return queries.length > 0;
} }

35
public/app/plugins/datasource/loki/shardQuerySplitting.test.ts
View File

@ -50,9 +50,7 @@ describe('runShardSplitQuery()', () => {
}; };
let request: DataQueryRequest<LokiQuery>; let request: DataQueryRequest<LokiQuery>;
beforeEach(() => { beforeEach(() => {
request = createRequest([ request = createRequest([{ expr: '$SELECTOR', refId: 'A', direction: LokiQueryDirection.Scan }]);
{ expr: 'count_over_time($SELECTOR[1m])', refId: 'A', direction: LokiQueryDirection.Scan },
]);
datasource = createLokiDatasource(); datasource = createLokiDatasource();
datasource.languageProvider.fetchLabelValues = jest.fn(); datasource.languageProvider.fetchLabelValues = jest.fn();
datasource.interpolateVariablesInQueries = jest.fn().mockImplementation((queries: LokiQuery[]) => { datasource.interpolateVariablesInQueries = jest.fn().mockImplementation((queries: LokiQuery[]) => {
@ -84,7 +82,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_0_2', requestId: 'TEST_shard_0_0_2',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=~"20|10"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=~"20|10"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -97,7 +95,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_2_2', requestId: 'TEST_shard_0_2_2',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=~"3|2"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=~"3|2"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -110,7 +108,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_4_1', requestId: 'TEST_shard_0_4_1',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__="1"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__="1"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -123,7 +121,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_5_1', requestId: 'TEST_shard_0_5_1',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=""} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=""}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -152,7 +150,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_0_2', requestId: 'TEST_shard_0_0_2',
targets: [ targets: [
{ {
expr: 'count_over_time({service_name="test", filter="true", __stream_shard__=~"20|10"} | drop __stream_shard__[1m])', expr: '{service_name="test", filter="true", __stream_shard__=~"20|10"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -210,9 +208,7 @@ describe('runShardSplitQuery()', () => {
}); });
test('Adjusts the group size based on errors and execution time', async () => { test('Adjusts the group size based on errors and execution time', async () => {
const request = createRequest( const request = createRequest([{ expr: '$SELECTOR', refId: 'A', direction: LokiQueryDirection.Scan }], {
[{ expr: 'count_over_time($SELECTOR[1m])', refId: 'A', direction: LokiQueryDirection.Scan }],
{
range: { range: {
from: dateTime('2024-11-13T05:00:00.000Z'), from: dateTime('2024-11-13T05:00:00.000Z'),
to: dateTime('2024-11-14T06:00:00.000Z'), to: dateTime('2024-11-14T06:00:00.000Z'),
@ -221,8 +217,7 @@ describe('runShardSplitQuery()', () => {
to: dateTime('2024-11-14T06:00:00.000Z'), to: dateTime('2024-11-14T06:00:00.000Z'),
}, },
}, },
} });
);
jest jest
.mocked(datasource.languageProvider.fetchLabelValues) .mocked(datasource.languageProvider.fetchLabelValues)
@ -381,7 +376,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_0_3', requestId: 'TEST_shard_0_0_3',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=~"20|10|9"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=~"20|10|9"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -395,7 +390,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_3_4', requestId: 'TEST_shard_0_3_4',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=~"8|7|6|5"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=~"8|7|6|5"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -409,7 +404,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_3_2', requestId: 'TEST_shard_0_3_2',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=~"8|7"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=~"8|7"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -423,7 +418,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_5_3', requestId: 'TEST_shard_0_5_3',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=~"6|5|4"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=~"6|5|4"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -437,7 +432,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_8_2', requestId: 'TEST_shard_0_8_2',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=~"3|2"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=~"3|2"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -451,7 +446,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_10_1', requestId: 'TEST_shard_0_10_1',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__="1"} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__="1"}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },
@ -465,7 +460,7 @@ describe('runShardSplitQuery()', () => {
requestId: 'TEST_shard_0_11_1', requestId: 'TEST_shard_0_11_1',
targets: [ targets: [
{ {
expr: 'count_over_time({a="b", __stream_shard__=""} | drop __stream_shard__[1m])', expr: '{a="b", __stream_shard__=""}',
refId: 'A', refId: 'A',
direction: LokiQueryDirection.Scan, direction: LokiQueryDirection.Scan,
}, },