IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Variables: Fixes issue with data source variables not being correctly used in panel queries (#49323)

Browse Source
This commit is contained in:
Joao Silva 2022-05-26 11:39:47 +01:00 committed by GitHub
parent 9b61d9eb1c
commit 8c477a288a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/query/state/PanelQueryRunner.ts
View File

@ -236,9 +236,11 @@ export class PanelQueryRunner {
try {
const ds = await getDataSource(datasource, request.scopedVars);
// Attach the data source name to each query
// Attach the data source to each query
request.targets = request.targets.map((query) => {
if (!query.datasource) {
// When using a data source variable, the panel might have the incorrect datasource
// stored, so when running the query make sure it is done with the correct one
if (!query.datasource || (query.datasource.uid !== ds.uid && !ds.meta.mixed)) {
query.datasource = ds.getRef();
}
return query;