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: Usage for queries not from dashboards (#60017)

Browse Source 
Loki: Usage for queries not from dashboars
This commit is contained in:
Ivana Huckova 2022-12-08 13:04:05 +01:00 committed by GitHub
parent e2077e9659
commit 3c9ccd4512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/elasticsearch/tracking.ts
View File

@ -1,4 +1,4 @@
import { DashboardLoadedEvent, DataQueryResponse } from '@grafana/data';
import { CoreApp, DashboardLoadedEvent, DataQueryResponse } from '@grafana/data';
import { reportInteraction } from '@grafana/runtime';
import { variableRegex } from 'app/features/variables/utils';
@ -111,6 +111,10 @@ const shouldNotReportBasedOnRefId = (refId: string): boolean => {
};
export function trackQuery(response: DataQueryResponse, queries: ElasticsearchQuery[], app: string): void {
if (app === CoreApp.Dashboard || app === CoreApp.PanelViewer) {
return;
}
for (const query of queries) {
if (shouldNotReportBasedOnRefId(query.refId)) {
return;

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

@ -6,6 +6,7 @@ import {
AbstractLabelOperator,
AnnotationQueryRequest,
ArrayVector,
CoreApp,
DataFrame,
dataFrameToJSON,
DataQueryResponse,
@ -134,7 +135,8 @@ describe('LokiDatasource', () => {
const runTest = async (
queryMaxLines: number | undefined,
dsMaxLines: string | undefined,
expectedMaxLines: number
expectedMaxLines: number,
app: CoreApp | undefined
) => {
const settings = {
jsonData: {
@ -150,6 +152,7 @@ describe('LokiDatasource', () => {
const options = getQueryOptions<LokiQuery>({
targets: [{ expr: '{a="b"}', refId: 'B', maxLines: queryMaxLines }],
app: app ?? CoreApp.Dashboard,
});
const fetchMock = jest.fn().mockReturnValue(of({ data: testLogsResponse }));
@ -162,19 +165,36 @@ describe('LokiDatasource', () => {
};
it('should use datasource max lines when no query max lines', async () => {
await runTest(undefined, '40', 40);
await runTest(undefined, '40', 40, undefined);
});
it('should use query max lines, if exists', async () => {
await runTest(80, undefined, 80);
await runTest(80, undefined, 80, undefined);
});
it('should use query max lines, if both exist, even if it is higher than ds max lines', async () => {
await runTest(80, '40', 80);
await runTest(80, '40', 80, undefined);
});
it('should report query interaction', async () => {
await runTest(80, '40', 80);
await runTest(80, '40', 80, CoreApp.Explore);
expect(reportInteraction).toHaveBeenCalledWith(
'grafana_loki_query_executed',
expect.objectContaining({
query_type: 'logs',
line_limit: 80,
parsed_query: parseToNodeNamesArray('{a="b"}').join(','),
})
);
});
it('should not report query interaction for dashboard query', async () => {
await runTest(80, '40', 80, CoreApp.Dashboard);
expect(reportInteraction).not.toBeCalled();
});
it('should not report query interaction for panel edit query', async () => {
await runTest(80, '40', 80, CoreApp.PanelEditor);
expect(reportInteraction).toHaveBeenCalledWith(
'grafana_loki_query_executed',
expect.objectContaining({

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

@ -1,4 +1,4 @@
import { DashboardLoadedEvent, DataQueryResponse } from '@grafana/data';
import { CoreApp, DashboardLoadedEvent, DataQueryResponse } from '@grafana/data';
import { reportInteraction } from '@grafana/runtime';
import { variableRegex } from 'app/features/variables/utils';
@ -133,6 +133,11 @@ const shouldNotReportBasedOnRefId = (refId: string): boolean => {
};
export function trackQuery(response: DataQueryResponse, queries: LokiQuery[], app: string): void {
// We only want to track usage for these specific apps
if (app === CoreApp.Dashboard || app === CoreApp.PanelViewer) {
return;
}
for (const query of queries) {
if (shouldNotReportBasedOnRefId(query.refId)) {
return;