DataSourceWithBackend: apply template variables (#22558)

packages/grafana-runtime/src/utils/DataSourceWithBackend.ts

@@ -44,7 +44,7 @@ export class DataSourceWithBackend<
         throw new Error('Unknown Datasource: ' + q.datasource);
         throw new Error('Unknown Datasource: ' + q.datasource);
       }
       }
       return {
       return {
-        ...q,
+        ...this.applyTemplateVariables(q),
         datasourceId: ds.id,
         datasourceId: ds.id,
         intervalMs,
         intervalMs,
         maxDataPoints,
         maxDataPoints,
@@ -71,6 +71,13 @@ export class DataSourceWithBackend<
   }
   }
 
 
   /**
   /**
+   * Override to apply template variables
+   */
+  applyTemplateVariables(query: DataQuery) {
+    return query;
+  }
+
+  /**
    * This makes the arrow library loading async.
    * This makes the arrow library loading async.
    */
    */
   async toDataQueryResponse(rsp: any): Promise<DataQueryResponse> {
   async toDataQueryResponse(rsp: any): Promise<DataQueryResponse> {