From e5811ad106d07d6e69db9beb7638585ca5ea7c48 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 17 Nov 2021 12:00:50 -0800
Subject: [PATCH] Query: send datasourceId along with datasource ref (#41830)

---
 .../grafana-runtime/src/utils/DataSourceWithBackend.test.ts    | 2 ++
 packages/grafana-runtime/src/utils/DataSourceWithBackend.ts    | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
index b499008c493..92c24fea1ae 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
@@ -68,6 +68,7 @@ describe('DataSourceWithBackend', () => {
                 "type": "dummy",
                 "uid": "abc",
               },
+              "datasourceId": 1234,
               "intervalMs": 5000,
               "maxDataPoints": 10,
               "refId": "A",
@@ -77,6 +78,7 @@ describe('DataSourceWithBackend', () => {
                 "type": "sample",
                 "uid": "?",
               },
+              "datasourceId": undefined,
               "intervalMs": 5000,
               "maxDataPoints": 10,
               "refId": "B",
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
index 5d33e4ea122..a9271e937a6 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
@@ -109,6 +109,7 @@ class DataSourceWithBackend<
 
     const queries = targets.map((q) => {
       let datasource = this.getRef();
+      let datasourceId = this.id;
 
       if (isExpressionReference(q.datasource)) {
         return {
@@ -125,11 +126,13 @@ class DataSourceWithBackend<
         }
 
         datasource = ds.rawRef ?? getDataSourceRef(ds);
+        datasourceId = ds.id;
       }
 
       return {
         ...this.applyTemplateVariables(q, request.scopedVars),
         datasource,
+        datasourceId, // deprecated!
         intervalMs,
         maxDataPoints,
       };