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

Explore: Update time range before running queries (#17349)

Browse Source 
This makes sure that refresh/update/run query are parsing a
relative time range to get proper epoch time range before
running queries.

Fixes #17322
This commit is contained in:
Marcus Efraimsson 2019-05-29 13:47:05 +02:00 committed by GitHub
parent 0a92de623d
commit e951e71843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/explore/state/actionTypes.ts
View File

@ -230,6 +230,7 @@ export interface LoadExploreDataSourcesPayload {
export interface RunQueriesPayload {
exploreId: ExploreId;
range: TimeRange;
}
export interface ResetQueryErrorPayload {

6
public/app/features/explore/state/actions.ts
View File

@ -521,6 +521,7 @@ export function runQueries(exploreId: ExploreId, ignoreUIState = false, replaceU
datasourceError,
containerWidth,
mode,
range,
} = getState().explore[exploreId];
if (datasourceError) {
@ -538,7 +539,10 @@ export function runQueries(exploreId: ExploreId, ignoreUIState = false, replaceU
// but we're using the datasource interval limit for now
const interval = datasourceInstance.interval;
dispatch(runQueriesAction({ exploreId }));
const timeZone = getTimeZone(getState().user);
const updatedRange = getTimeRange(timeZone, range.raw);
dispatch(runQueriesAction({ exploreId, range: updatedRange }));
// Keep table queries first since they need to return quickly
if ((ignoreUIState || showingTable) && mode === ExploreMode.Metrics) {
dispatch(

11
public/app/features/explore/state/reducers.test.ts
View File

@ -4,6 +4,7 @@ import {
exploreReducer,
makeInitialUpdateState,
initialExploreState,
DEFAULT_RANGE,
} from './reducers';
import {
ExploreId,
@ -31,7 +32,7 @@ import { ActionOf } from 'app/core/redux/actionCreatorFactory';
import { updateLocation } from 'app/core/actions/location';
import { serializeStateToUrlParam } from 'app/core/utils/explore';
import TableModel from 'app/core/table_model';
import { DataSourceApi, DataQuery, LogsModel, LogsDedupStrategy } from '@grafana/ui';
import { DataSourceApi, DataQuery, LogsModel, LogsDedupStrategy, dateTime } from '@grafana/ui';
describe('Explore item reducer', () => {
describe('scanning', () => {
@ -193,6 +194,7 @@ describe('Explore item reducer', () => {
it('then it should set correct state', () => {
const initalState: Partial<ExploreItemState> = {
showingStartPage: true,
range: null,
};
const expectedState = {
queryIntervals: {
@ -200,11 +202,16 @@ describe('Explore item reducer', () => {
intervalMs: 1000,
},
showingStartPage: false,
range: {
from: dateTime(),
to: dateTime(),
raw: DEFAULT_RANGE,
},
};
reducerTester()
.givenReducer(itemReducer, initalState)
.whenActionIsDispatched(runQueriesAction({ exploreId: ExploreId.left }))
.whenActionIsDispatched(runQueriesAction({ exploreId: ExploreId.left, range: expectedState.range }))
.thenStateShouldEqual(expectedState);
});
});

6
public/app/features/explore/state/reducers.ts
View File

@ -599,8 +599,9 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
})
.addMapper({
filter: runQueriesAction,
mapper: (state): ExploreItemState => {
const { range, datasourceInstance, containerWidth } = state;
mapper: (state, action): ExploreItemState => {
const { range } = action.payload;
const { datasourceInstance, containerWidth } = state;
let interval = '1s';
if (datasourceInstance && datasourceInstance.interval) {
interval = datasourceInstance.interval;
@ -608,6 +609,7 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
const queryIntervals = getIntervals(range, interval, containerWidth);
return {
...state,
range,
queryIntervals,
showingStartPage: false,
};