From f451695ea6dcac94eb1213578a88b096207a7516 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 25 Feb 2021 22:50:15 -0800
Subject: [PATCH] Grafana datasource: support multiple targets (#31495)

---
 public/app/plugins/datasource/grafana/datasource.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 5d5a5ff581f..0c422e0885c 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -11,7 +11,7 @@ import {
 
 import { GrafanaQuery, GrafanaAnnotationQuery, GrafanaAnnotationType, GrafanaQueryType } from './types';
 import { getBackendSrv, getTemplateSrv, toDataQueryResponse, getLiveMeasurementsObserver } from '@grafana/runtime';
-import { Observable, of } from 'rxjs';
+import { Observable, of, merge } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
 
 let counter = 100;
@@ -51,8 +51,7 @@ export class GrafanaDatasource extends DataSourceApi<GrafanaQuery> {
       return queries[0];
     }
     if (queries.length > 1) {
-      // HELP!!!
-      return queries[0];
+      return merge(...queries);
     }
     return of(); // nothing
   }