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

Grafana datasource: support multiple targets (#31495)

Browse Source
This commit is contained in:
Ryan McKinley 2021-02-25 22:50:15 -08:00 committed by GitHub
parent e13333fa86
commit f451695ea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/grafana/datasource.ts
View File

@ -11,7 +11,7 @@ import {
import { GrafanaQuery, GrafanaAnnotationQuery, GrafanaAnnotationType, GrafanaQueryType } from './types'; import { GrafanaQuery, GrafanaAnnotationQuery, GrafanaAnnotationType, GrafanaQueryType } from './types';
import { getBackendSrv, getTemplateSrv, toDataQueryResponse, getLiveMeasurementsObserver } from '@grafana/runtime'; 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'; import { map, catchError } from 'rxjs/operators';
let counter = 100; let counter = 100;
@ -51,8 +51,7 @@ export class GrafanaDatasource extends DataSourceApi<GrafanaQuery> {
return queries[0]; return queries[0];
} }
if (queries.length > 1) { if (queries.length > 1) {
// HELP!!! return merge(...queries);
return queries[0];
} }
return of(); // nothing return of(); // nothing
} }