IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Loki: Remove parsed_query from tracking in favor of obfuscated_query (#81042)

Browse Source 
* Loki: Remove `parsed_query` from tracking in favor of `obfuscated_query`

* newline
This commit is contained in:
Sven Grossmann 2024-01-23 21:47:29 +01:00 committed by GitHub
parent 0aaebbb9a2
commit 0173755446
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@ import { createLokiDatasource } from './__mocks__/datasource';
import { createMetadataRequest } from './__mocks__/metadataRequest';
import { LokiDatasource, REF_ID_DATA_SAMPLES } from './datasource';
import { runSplitQuery } from './querySplitting';
import { parseToNodeNamesArray } from './queryUtils';
import { LokiOptions, LokiQuery, LokiQueryType, LokiVariableQueryType, SupportingQueryType } from './types';
jest.mock('@grafana/runtime', () => {
@ -209,7 +208,7 @@ describe('LokiDatasource', () => {
expect.objectContaining({
query_type: 'logs',
line_limit: 80,
parsed_query: parseToNodeNamesArray('{a="b"}').join(','),
obfuscated_query: '{Identifier=String}',
})
);
});
@ -226,7 +225,7 @@ describe('LokiDatasource', () => {
expect.objectContaining({
query_type: 'logs',
line_limit: 80,
parsed_query: parseToNodeNamesArray('{a="b"}').join(','),
obfuscated_query: '{Identifier=String}',
})
);
});

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

@ -79,8 +79,6 @@ test('Tracks queries', () => {
legend: undefined,
line_limit: undefined,
obfuscated_query: 'count_over_time({Identifier=String}[1m])',
parsed_query:
'LogQL,Expr,MetricExpr,RangeAggregationExpr,RangeOp,CountOverTime,LogRangeExpr,Selector,Matchers,Matcher,Identifier,Eq,String,Range,Duration',
query_type: 'metric',
query_vector_type: undefined,
resolution: 1,
@ -107,8 +105,6 @@ test('Tracks predefined operations', () => {
legend: undefined,
line_limit: undefined,
obfuscated_query: 'count_over_time({Identifier=String}[1m])',
parsed_query:
'LogQL,Expr,MetricExpr,RangeAggregationExpr,RangeOp,CountOverTime,LogRangeExpr,Selector,Matchers,Matcher,Identifier,Eq,String,Range,Duration',
query_type: 'metric',
query_vector_type: undefined,
resolution: 1,
@ -135,8 +131,6 @@ test('Tracks grouped queries', () => {
legend: undefined,
line_limit: undefined,
obfuscated_query: 'count_over_time({Identifier=String}[1m])',
parsed_query:
'LogQL,Expr,MetricExpr,RangeAggregationExpr,RangeOp,CountOverTime,LogRangeExpr,Selector,Matchers,Matcher,Identifier,Eq,String,Range,Duration',
query_type: 'metric',
query_vector_type: undefined,
resolution: 1,
@ -163,7 +157,6 @@ test('Tracks grouped queries', () => {
legend: undefined,
line_limit: 10,
obfuscated_query: '{Identifier=String}',
parsed_query: 'LogQL,Expr,LogExpr,Selector,Matchers,Matcher,Identifier,Eq,String',
query_type: 'logs',
query_vector_type: undefined,
resolution: 1,

3
public/app/plugins/datasource/loki/tracking.ts
View File

@ -10,7 +10,7 @@ import {
REF_ID_STARTER_LOG_VOLUME,
} from './datasource';
import pluginJson from './plugin.json';
import { getNormalizedLokiQuery, isLogsQuery, obfuscate, parseToNodeNamesArray } from './queryUtils';
import { getNormalizedLokiQuery, isLogsQuery, obfuscate } from './queryUtils';
import { variableRegex } from './querybuilder/parsingUtils';
import { LokiGroupedRequest, LokiQuery, LokiQueryType } from './types';
@ -177,7 +177,6 @@ export function trackQuery(
has_error: response.error !== undefined,
legend: query.legendFormat,
line_limit: query.maxLines,
parsed_query: parseToNodeNamesArray(query.expr).join(','),
obfuscated_query: obfuscate(query.expr),
query_type: isLogsQuery(query.expr) ? 'logs' : 'metric',
query_vector_type: query.queryType,