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

Annotations: fixes variable values not displaying in annotations. (#37883)

Browse Source 
* Fixes wrong annotation when opening dashboard with URL encoded variable
Co-authored-by: Ashley Harrison, Hugo Haggmark, and Tobias Skarhed.

* added a more descriptive comment
This commit is contained in:
Uchechukwu Obasi
2021-08-13 14:38:57 +01:00
committed by GitHub
parent 7a01fb369d
commit 4e98ade2af
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/dashboard/state/initDashboard.ts
View File

@@ -155,8 +155,6 @@ export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
dashboardSrv.setCurrent(dashboard); dashboardSrv.setCurrent(dashboard);
timeSrv.init(dashboard); timeSrv.init(dashboard);
const runner = createDashboardQueryRunner({ dashboard, timeSrv });
runner.run({ dashboard, range: timeSrv.timeRange() });
if (storeState.dashboard.modifiedQueries) { if (storeState.dashboard.modifiedQueries) {
const { panelId, queries } = storeState.dashboard.modifiedQueries; const { panelId, queries } = storeState.dashboard.modifiedQueries;
@@ -166,6 +164,11 @@ export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
// template values service needs to initialize completely before the rest of the dashboard can load // template values service needs to initialize completely before the rest of the dashboard can load
await dispatch(initVariablesTransaction(args.urlUid!, dashboard)); await dispatch(initVariablesTransaction(args.urlUid!, dashboard));
// DashboardQueryRunner needs to run after all variables have been resolved so that any annotation query including a variable
// will be correctly resolved
const runner = createDashboardQueryRunner({ dashboard, timeSrv });
runner.run({ dashboard, range: timeSrv.timeRange() });
if (getState().templating.transaction.uid !== args.urlUid) { if (getState().templating.transaction.uid !== args.urlUid) {
// if a previous dashboard has slow running variable queries the batch uid will be the new one // if a previous dashboard has slow running variable queries the batch uid will be the new one
// but the args.urlUid will be the same as before initVariablesTransaction was called so then we can't continue initializing // but the args.urlUid will be the same as before initVariablesTransaction was called so then we can't continue initializing