From ff870e08b2af5e8f2c79465b4fd7b469ca1d2bb4 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 22 Apr 2019 19:14:42 -0700
Subject: [PATCH] PanelQueryRunner: add datasource name to queries (#16712)

---
 public/app/features/dashboard/state/PanelQueryRunner.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/app/features/dashboard/state/PanelQueryRunner.ts b/public/app/features/dashboard/state/PanelQueryRunner.ts
index 5d6d02103f2..208a9c7686c 100644
--- a/public/app/features/dashboard/state/PanelQueryRunner.ts
+++ b/public/app/features/dashboard/state/PanelQueryRunner.ts
@@ -133,6 +133,14 @@ export class PanelQueryRunner {
           ? (datasource as DataSourceApi)
           : await getDatasourceSrv().get(datasource as string, request.scopedVars);
 
+      // Attach the datasource name to each query
+      request.targets = request.targets.map(query => {
+        if (!query.datasource) {
+          query.datasource = ds.name;
+        }
+        return query;
+      });
+
       const lowerIntervalLimit = minInterval ? templateSrv.replace(minInterval, request.scopedVars) : ds.interval;
       const norm = kbn.calculateInterval(timeRange, widthPixels, lowerIntervalLimit);