IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: Fix query cancellation when opening an url with split panes (#36847)

Browse Source 
* Add exploreId to requestId

* Fix tests
This commit is contained in:
Andrej Ocenas 2021-07-19 17:29:51 +02:00 committed by GitHub
parent a11294ae9d
commit 001331e2ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/core/utils/explore.test.ts
View File

@ -16,6 +16,7 @@ import store from 'app/core/store';
import { dateTime, ExploreUrlState, LogsSortOrder } from '@grafana/data'; import { dateTime, ExploreUrlState, LogsSortOrder } from '@grafana/data';
import { RefreshPicker } from '@grafana/ui'; import { RefreshPicker } from '@grafana/ui';
import { serializeStateToUrlParam } from '@grafana/data/src/utils/url'; import { serializeStateToUrlParam } from '@grafana/data/src/utils/url';
import { ExploreId } from '../../types';
const DEFAULT_EXPLORE_STATE: ExploreUrlState = { const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
datasource: '', datasource: '',
@ -417,21 +418,21 @@ describe('when buildQueryTransaction', () => {
const queries = [{ refId: 'A' }]; const queries = [{ refId: 'A' }];
const queryOptions = { maxDataPoints: 1000, minInterval: '15s' }; const queryOptions = { maxDataPoints: 1000, minInterval: '15s' };
const range = { from: dateTime().subtract(1, 'd'), to: dateTime(), raw: { from: '1h', to: '1h' } }; const range = { from: dateTime().subtract(1, 'd'), to: dateTime(), raw: { from: '1h', to: '1h' } };
const transaction = buildQueryTransaction(queries, queryOptions, range, false); const transaction = buildQueryTransaction(ExploreId.left, queries, queryOptions, range, false);
expect(transaction.request.intervalMs).toEqual(60000); expect(transaction.request.intervalMs).toEqual(60000);
}); });
it('it should calculate interval taking minInterval into account', () => { it('it should calculate interval taking minInterval into account', () => {
const queries = [{ refId: 'A' }]; const queries = [{ refId: 'A' }];
const queryOptions = { maxDataPoints: 1000, minInterval: '15s' }; const queryOptions = { maxDataPoints: 1000, minInterval: '15s' };
const range = { from: dateTime().subtract(1, 'm'), to: dateTime(), raw: { from: '1h', to: '1h' } }; const range = { from: dateTime().subtract(1, 'm'), to: dateTime(), raw: { from: '1h', to: '1h' } };
const transaction = buildQueryTransaction(queries, queryOptions, range, false); const transaction = buildQueryTransaction(ExploreId.left, queries, queryOptions, range, false);
expect(transaction.request.intervalMs).toEqual(15000); expect(transaction.request.intervalMs).toEqual(15000);
}); });
it('it should calculate interval taking maxDataPoints into account', () => { it('it should calculate interval taking maxDataPoints into account', () => {
const queries = [{ refId: 'A' }]; const queries = [{ refId: 'A' }];
const queryOptions = { maxDataPoints: 10, minInterval: '15s' }; const queryOptions = { maxDataPoints: 10, minInterval: '15s' };
const range = { from: dateTime().subtract(1, 'd'), to: dateTime(), raw: { from: '1h', to: '1h' } }; const range = { from: dateTime().subtract(1, 'd'), to: dateTime(), raw: { from: '1h', to: '1h' } };
const transaction = buildQueryTransaction(queries, queryOptions, range, false); const transaction = buildQueryTransaction(ExploreId.left, queries, queryOptions, range, false);
expect(transaction.request.interval).toEqual('2h'); expect(transaction.request.interval).toEqual('2h');
}); });
}); });

5
public/app/core/utils/explore.ts
View File

@ -29,7 +29,7 @@ import { v4 as uuidv4 } from 'uuid';
import { getNextRefIdChar } from './query'; import { getNextRefIdChar } from './query';
// Types // Types
import { RefreshPicker } from '@grafana/ui'; import { RefreshPicker } from '@grafana/ui';
import { QueryOptions, QueryTransaction } from 'app/types/explore'; import { ExploreId, QueryOptions, QueryTransaction } from 'app/types/explore';
import { config } from '../config'; import { config } from '../config';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
import { DataSourceSrv } from '@grafana/runtime'; import { DataSourceSrv } from '@grafana/runtime';
@ -116,6 +116,7 @@ export async function getExploreUrl(args: GetExploreUrlArguments): Promise<strin
} }
export function buildQueryTransaction( export function buildQueryTransaction(
exploreId: ExploreId,
queries: DataQuery[], queries: DataQuery[],
queryOptions: QueryOptions, queryOptions: QueryOptions,
range: TimeRange, range: TimeRange,
@ -148,7 +149,7 @@ export function buildQueryTransaction(
panelId: panelId as any, panelId: panelId as any,
targets: queries, // Datasources rely on DataQueries being passed under the targets key. targets: queries, // Datasources rely on DataQueries being passed under the targets key.
range, range,
requestId: 'explore', requestId: 'explore_' + exploreId,
rangeRaw: range.raw, rangeRaw: range.raw,
scopedVars: { scopedVars: {
__interval: { text: interval, value: interval }, __interval: { text: interval, value: interval },

2
public/app/features/explore/state/query.ts
View File

@ -383,7 +383,7 @@ export const runQueries = (
const datasourceName = datasourceInstance.name; const datasourceName = datasourceInstance.name;
const timeZone = getTimeZone(getState().user); const timeZone = getTimeZone(getState().user);
const transaction = buildQueryTransaction(queries, queryOptions, range, scanning, timeZone); const transaction = buildQueryTransaction(exploreId, queries, queryOptions, range, scanning, timeZone);
let firstResponse = true; let firstResponse = true;
dispatch(changeLoadingStateAction({ exploreId, loadingState: LoadingState.Loading })); dispatch(changeLoadingStateAction({ exploreId, loadingState: LoadingState.Loading }));