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

Loki: Drop all errors in volume requests (#79686)

Browse Source
This commit is contained in:
Sven Grossmann 2023-12-19 14:21:08 +01:00 committed by GitHub
parent ea079ebf0c
commit a15681c93c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
public/app/plugins/datasource/loki/datasource.test.ts
View File

@ -1239,7 +1239,7 @@ describe('LokiDatasource', () => {
it('creates provider for logs query', () => {
const options = getQueryOptions<LokiQuery>({
targets: [{ expr: '{label=value}', refId: 'A', queryType: LokiQueryType.Range }],
targets: [{ expr: '{label="value"}', refId: 'A', queryType: LokiQueryType.Range }],
});
expect(ds.getDataProvider(SupplementaryQueryType.LogsVolume, options)).toBeDefined();
@ -1247,7 +1247,7 @@ describe('LokiDatasource', () => {
it('does not create provider for metrics query', () => {
const options = getQueryOptions<LokiQuery>({
targets: [{ expr: 'rate({label=value}[1m])', refId: 'A' }],
targets: [{ expr: 'rate({label="value"}[1m])', refId: 'A' }],
});
expect(ds.getDataProvider(SupplementaryQueryType.LogsVolume, options)).not.toBeDefined();
@ -1256,8 +1256,8 @@ describe('LokiDatasource', () => {
it('creates provider if at least one query is a logs query', () => {
const options = getQueryOptions<LokiQuery>({
targets: [
{ expr: 'rate({label=value}[1m])', queryType: LokiQueryType.Range, refId: 'A' },
{ expr: '{label=value}', queryType: LokiQueryType.Range, refId: 'B' },
{ expr: 'rate({label="value"}[1m])', queryType: LokiQueryType.Range, refId: 'A' },
{ expr: '{label="value"}', queryType: LokiQueryType.Range, refId: 'B' },
],
});
@ -1266,7 +1266,7 @@ describe('LokiDatasource', () => {
it('does not create provider if there is only an instant logs query', () => {
const options = getQueryOptions<LokiQuery>({
targets: [{ expr: '{label=value', refId: 'A', queryType: LokiQueryType.Instant }],
targets: [{ expr: '{label="value"', refId: 'A', queryType: LokiQueryType.Instant }],
});
expect(ds.getDataProvider(SupplementaryQueryType.LogsVolume, options)).not.toBeDefined();
@ -1281,7 +1281,7 @@ describe('LokiDatasource', () => {
it('creates provider for metrics query', () => {
const options = getQueryOptions<LokiQuery>({
targets: [{ expr: 'rate({label=value}[5m])', refId: 'A' }],
targets: [{ expr: 'rate({label="value"}[5m])', refId: 'A' }],
});
expect(ds.getDataProvider(SupplementaryQueryType.LogsSample, options)).toBeDefined();
@ -1289,7 +1289,7 @@ describe('LokiDatasource', () => {
it('does not create provider for log query', () => {
const options = getQueryOptions<LokiQuery>({
targets: [{ expr: '{label=value}', refId: 'A' }],
targets: [{ expr: '{label="value"}', refId: 'A' }],
});
expect(ds.getDataProvider(SupplementaryQueryType.LogsSample, options)).not.toBeDefined();
@ -1298,8 +1298,8 @@ describe('LokiDatasource', () => {
it('creates provider if at least one query is a metric query', () => {
const options = getQueryOptions<LokiQuery>({
targets: [
{ expr: 'rate({label=value}[1m])', refId: 'A' },
{ expr: '{label=value}', refId: 'B' },
{ expr: 'rate({label="value"}[1m])', refId: 'A' },
{ expr: '{label="value"}', refId: 'B' },
],
});
@ -1320,12 +1320,12 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsVolume },
{
expr: '{label=value}',
expr: '{label="value"}',
refId: 'A',
}
)
).toEqual({
expr: 'sum by (level) (count_over_time({label=value}[$__auto]))',
expr: 'sum by (level) (count_over_time({label="value"} | drop __error__[$__auto]))',
queryType: LokiQueryType.Range,
refId: 'log-volume-A',
supportingQueryType: SupportingQueryType.LogsVolume,
@ -1337,13 +1337,13 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsVolume },
{
expr: '{label=value}',
expr: '{label="value"}',
queryType: LokiQueryType.Range,
refId: 'A',
}
)
).toEqual({
expr: 'sum by (level) (count_over_time({label=value}[$__auto]))',
expr: 'sum by (level) (count_over_time({label="value"} | drop __error__[$__auto]))',
queryType: LokiQueryType.Range,
refId: 'log-volume-A',
supportingQueryType: SupportingQueryType.LogsVolume,
@ -1355,7 +1355,7 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsVolume },
{
expr: '{label=value}',
expr: '{label="value"}',
queryType: LokiQueryType.Instant,
refId: 'A',
}
@ -1368,7 +1368,7 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsVolume },
{
expr: 'rate({label=value}[5m]',
expr: 'rate({label="value"}[5m]',
queryType: LokiQueryType.Range,
refId: 'A',
}
@ -1383,13 +1383,13 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsSample },
{
expr: 'rate({label=value}[5m]',
expr: 'rate({label="value"}[5m]',
queryType: LokiQueryType.Range,
refId: 'A',
}
)
).toEqual({
expr: '{label=value}',
expr: '{label="value"}',
queryType: 'range',
refId: 'log-sample-A',
maxLines: 20,
@ -1401,13 +1401,13 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsSample },
{
expr: 'rate({label=value}[5m]',
expr: 'rate({label="value"}[5m]',
queryType: LokiQueryType.Instant,
refId: 'A',
}
)
).toEqual({
expr: '{label=value}',
expr: '{label="value"}',
queryType: LokiQueryType.Range,
refId: 'log-sample-A',
maxLines: 20,
@ -1419,13 +1419,13 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsSample, limit: 5 },
{
expr: 'rate({label=value}[5m]',
expr: 'rate({label="value"}[5m]',
queryType: LokiQueryType.Instant,
refId: 'A',
}
)
).toEqual({
expr: '{label=value}',
expr: '{label="value"}',
queryType: LokiQueryType.Range,
refId: 'log-sample-A',
maxLines: 5,
@ -1437,7 +1437,7 @@ describe('LokiDatasource', () => {
ds.getSupplementaryQuery(
{ type: SupplementaryQueryType.LogsSample },
{
expr: '{label=value}',
expr: '{label="value"}',
queryType: LokiQueryType.Range,
refId: 'A',
}

7
public/app/plugins/datasource/loki/datasource.ts
View File

@ -208,7 +208,7 @@ export class LokiDatasource
}
const normalizedQuery = getNormalizedLokiQuery(query);
const expr = removeCommentsFromQuery(normalizedQuery.expr);
let expr = removeCommentsFromQuery(normalizedQuery.expr);
let isQuerySuitable = false;
switch (options.type) {
@ -219,6 +219,11 @@ export class LokiDatasource
return undefined;
}
const dropErrorExpression = `${expr} | drop __error__`;
if (isQueryWithError(this.interpolateString(dropErrorExpression, placeHolderScopedVars)) === false) {
expr = dropErrorExpression;
}
return {
...normalizedQuery,
refId: `${REF_ID_STARTER_LOG_VOLUME}${normalizedQuery.refId}`,

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

@ -195,7 +195,7 @@ export function getNodeFromQuery(query: string, nodeType: number): SyntaxNode |
}
/**
* Parses the query and looks for error nodes. If there is at least one, it returns false.
* Parses the query and looks for error nodes. If there is at least one, it returns true.
* Grafana variables are considered errors, so if you need to validate a query
* with variables you should interpolate it first.
*/