diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index 87c2a83433d..d1db8834080 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -864,6 +864,20 @@ describe('LokiDatasource', () => { expect(queries[0].expr).toBe('{foo="bar"}'); }); }); + + describe('getDataSamples', () => { + it('hide request from inspector', () => { + const ds = createLokiDatasource(templateSrvStub); + const spy = jest.spyOn(ds, 'query').mockImplementation(() => of({} as DataQueryResponse)); + ds.getDataSamples({ expr: '{job="bar"}', refId: 'A' }); + expect(spy).toHaveBeenCalledWith( + expect.objectContaining({ + hideFromInspector: true, + requestId: 'log-samples', + }) + ); + }); + }); }); describe('applyTemplateVariables', () => { diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index db17e26be79..4af4711fcd7 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -77,7 +77,13 @@ export const DEFAULT_MAX_LINES = 1000; export const LOKI_ENDPOINT = '/loki/api/v1'; const NS_IN_MS = 1000000; -function makeRequest(query: LokiQuery, range: TimeRange, app: CoreApp, requestId: string): DataQueryRequest { +function makeRequest( + query: LokiQuery, + range: TimeRange, + app: CoreApp, + requestId: string, + hideFromInspector?: boolean +): DataQueryRequest { const intervalInfo = rangeUtil.calculateInterval(range, 1); return { targets: [query], @@ -89,6 +95,7 @@ function makeRequest(query: LokiQuery, range: TimeRange, app: CoreApp, requestId timezone: 'UTC', app, startTime: Date.now(), + hideFromInspector, }; } @@ -413,7 +420,7 @@ export class LokiDatasource // 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'); + const request = makeRequest(lokiLogsQuery, timeRange, CoreApp.Explore, 'log-samples', true); return await lastValueFrom(this.query(request).pipe(switchMap((res) => of(res.data)))); }