IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

QueryVariable: Always run queries with dashboard time range (#79056)

Browse Source
This commit is contained in:
Dominik Prokop 2023-12-05 15:06:26 +01:00 committed by GitHub
parent 043096d652
commit c30098e772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/variables/query/VariableQueryRunner.ts
View File

@ -7,7 +7,6 @@ import {
DataQuery, DataQuery,
DataQueryRequest, DataQueryRequest,
DataSourceApi, DataSourceApi,
getDefaultTimeRange,
LoadingState, LoadingState,
PanelData, PanelData,
ScopedVars, ScopedVars,
@ -19,7 +18,7 @@ import { getTimeSrv } from '../../dashboard/services/TimeSrv';
import { runRequest } from '../../query/state/runRequest'; import { runRequest } from '../../query/state/runRequest';
import { getLastKey, getVariable } from '../state/selectors'; import { getLastKey, getVariable } from '../state/selectors';
import { KeyedVariableIdentifier } from '../state/types'; import { KeyedVariableIdentifier } from '../state/types';
import { QueryVariableModel, VariableRefresh } from '../types'; import { QueryVariableModel } from '../types';
import { getTemplatedRegex } from '../utils'; import { getTemplatedRegex } from '../utils';
import { toMetricFindValuesOperator, updateOptionsState, validateVariableSelection } from './operators'; import { toMetricFindValuesOperator, updateOptionsState, validateVariableSelection } from './operators';
@ -175,10 +174,7 @@ export class VariableQueryRunner {
const searchFilterScope = { searchFilter: { text: searchFilter, value: searchFilter } }; const searchFilterScope = { searchFilter: { text: searchFilter, value: searchFilter } };
const searchFilterAsVars = searchFilter ? searchFilterScope : {}; const searchFilterAsVars = searchFilter ? searchFilterScope : {};
const scopedVars = { ...searchFilterAsVars, ...variableAsVars } as ScopedVars; const scopedVars = { ...searchFilterAsVars, ...variableAsVars } as ScopedVars;
const range = const range = this.dependencies.getTimeSrv().timeRange();
variable.refresh === VariableRefresh.onTimeRangeChanged
? this.dependencies.getTimeSrv().timeRange()
: getDefaultTimeRange();
const request: DataQueryRequest = { const request: DataQueryRequest = {
app: CoreApp.Dashboard, app: CoreApp.Dashboard,