From 1aa94165d90e2e9e916a6676b4de643e948d371d Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Wed, 7 Dec 2022 16:24:22 +0100 Subject: [PATCH] Loki: Do not track samples (#59960) --- public/app/plugins/datasource/loki/datasource.test.ts | 4 ++-- public/app/plugins/datasource/loki/datasource.ts | 5 +++-- public/app/plugins/datasource/loki/tracking.ts | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index 4598d5ac948..c79f9327d75 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -28,7 +28,7 @@ import { TemplateSrv } from 'app/features/templating/template_srv'; import { initialCustomVariableModelState } from '../../../features/variables/custom/reducer'; import { CustomVariableModel } from '../../../features/variables/types'; -import { LokiDatasource } from './datasource'; +import { LokiDatasource, REF_ID_DATA_SAMPLES } from './datasource'; import { createLokiDatasource, createMetadataRequest } from './mocks'; import { parseToNodeNamesArray } from './queryUtils'; import { LokiOptions, LokiQuery, LokiQueryType, LokiVariableQueryType } from './types'; @@ -946,7 +946,7 @@ describe('LokiDatasource', () => { expect(spy).toHaveBeenCalledWith( expect.objectContaining({ hideFromInspector: true, - requestId: 'log-samples', + requestId: REF_ID_DATA_SAMPLES, }) ); }); diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index debd615c4b3..bb83acbb583 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -76,6 +76,7 @@ import { LokiVariableSupport } from './variables'; export type RangeQueryOptions = DataQueryRequest | AnnotationQueryRequest; export const DEFAULT_MAX_LINES = 1000; export const LOKI_ENDPOINT = '/loki/api/v1'; +export const REF_ID_DATA_SAMPLES = 'loki-data-samples'; const NS_IN_MS = 1000000; function makeRequest( @@ -419,13 +420,13 @@ export class LokiDatasource const lokiLogsQuery: LokiQuery = { expr: query.expr, queryType: LokiQueryType.Range, - refId: 'log-samples', + refId: REF_ID_DATA_SAMPLES, maxLines: 10, }; // For samples, we use defaultTimeRange (now-6h/now) and limit od 10 lines so queries are small and fast const timeRange = getDefaultTimeRange(); - const request = makeRequest(lokiLogsQuery, timeRange, CoreApp.Explore, 'log-samples', true); + const request = makeRequest(lokiLogsQuery, timeRange, CoreApp.Unknown, REF_ID_DATA_SAMPLES, true); return await lastValueFrom(this.query(request).pipe(switchMap((res) => of(res.data)))); } diff --git a/public/app/plugins/datasource/loki/tracking.ts b/public/app/plugins/datasource/loki/tracking.ts index 18fdb94d1e4..ec21afc83f6 100644 --- a/public/app/plugins/datasource/loki/tracking.ts +++ b/public/app/plugins/datasource/loki/tracking.ts @@ -4,6 +4,7 @@ import { variableRegex } from 'app/features/variables/utils'; import { QueryEditorMode } from '../prometheus/querybuilder/shared/types'; +import { REF_ID_DATA_SAMPLES } from './datasource'; import pluginJson from './plugin.json'; import { getNormalizedLokiQuery, isLogsQuery, parseToNodeNamesArray } from './queryUtils'; import { LokiQuery, LokiQueryType } from './types'; @@ -119,6 +120,9 @@ const isQueryWithChangedLegend = (query: LokiQuery): boolean => { export function trackQuery(response: DataQueryResponse, queries: LokiQuery[], app: string): void { for (const query of queries) { + if (query.refId === REF_ID_DATA_SAMPLES) { + return; + } reportInteraction('grafana_loki_query_executed', { app, editor_mode: query.editorMode,