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: Hide sample loki queries from inspector (#55158)

Browse Source
This commit is contained in:
Ivana Huckova 2022-09-14 14:25:25 +02:00 committed by GitHub
parent 7a6f452f13
commit 4503e0f417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -864,6 +864,20 @@ describe('LokiDatasource', () => {
expect(queries[0].expr).toBe('{foo="bar"}'); 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', () => { describe('applyTemplateVariables', () => {

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

@ -77,7 +77,13 @@ export const DEFAULT_MAX_LINES = 1000;
export const LOKI_ENDPOINT = '/loki/api/v1'; export const LOKI_ENDPOINT = '/loki/api/v1';
const NS_IN_MS = 1000000; const NS_IN_MS = 1000000;
function makeRequest(query: LokiQuery, range: TimeRange, app: CoreApp, requestId: string): DataQueryRequest<LokiQuery> { function makeRequest(
query: LokiQuery,
range: TimeRange,
app: CoreApp,
requestId: string,
hideFromInspector?: boolean
): DataQueryRequest<LokiQuery> {
const intervalInfo = rangeUtil.calculateInterval(range, 1); const intervalInfo = rangeUtil.calculateInterval(range, 1);
return { return {
targets: [query], targets: [query],
@ -89,6 +95,7 @@ function makeRequest(query: LokiQuery, range: TimeRange, app: CoreApp, requestId
timezone: 'UTC', timezone: 'UTC',
app, app,
startTime: Date.now(), 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 // For samples, we use defaultTimeRange (now-6h/now) and limit od 10 lines so queries are small and fast
const timeRange = getDefaultTimeRange(); 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)))); return await lastValueFrom(this.query(request).pipe(switchMap((res) => of(res.data))));
} }