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

Tempo: Decrease the default Tempo search limit to 20 (#40030)

Browse Source
This commit is contained in:
Connor Lindsey
2021-10-06 08:43:13 -06:00
committed by GitHub
parent 98a9b4adc5
commit 3e33330e27
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/tempo/datasource.test.ts
View File

@@ -12,7 +12,7 @@ import {
import { createFetchResponse } from 'test/helpers/createFetchResponse';
import { BackendDataSourceResponse, FetchResponse, setBackendSrv, setDataSourceSrv } from '@grafana/runtime';
import { TempoDatasource, TempoQuery } from './datasource';
import { DEFAULT_LIMIT, TempoDatasource, TempoQuery } from './datasource';
import mockJson from './mockJsonResponse.json';
describe('Tempo data source', () => {
@@ -155,7 +155,7 @@ describe('Tempo data source', () => {
});
});
it('should include a default limit of 100', () => {
it('should include a default limit', () => {
const ds = new TempoDatasource(defaultSettings);
const tempoQuery: TempoQuery = {
queryType: 'search',
@@ -165,7 +165,7 @@ describe('Tempo data source', () => {
};
const builtQuery = ds.buildSearchQuery(tempoQuery);
expect(builtQuery).toStrictEqual({
limit: 100,
limit: DEFAULT_LIMIT,
});
});
@@ -179,7 +179,7 @@ describe('Tempo data source', () => {
};
const builtQuery = ds.buildSearchQuery(tempoQuery);
expect(builtQuery).toStrictEqual({
limit: 100,
limit: DEFAULT_LIMIT,
'root.http.status_code': '500',
});
});

4
public/app/plugins/datasource/tempo/datasource.ts
View File

@@ -54,6 +54,8 @@ export type TempoQuery = {
limit?: number;
} & DataQuery;
export const DEFAULT_LIMIT = 20;
export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJsonData> {
tracesToLogs?: TraceToLogsOptions;
serviceMap?: {
@@ -238,7 +240,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
// Set default limit
if (!tempoQuery.limit) {
tempoQuery.limit = 100;
tempoQuery.limit = DEFAULT_LIMIT;
}
// Validate query inputs and remove spaces if valid