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

MixedDatasources: Do not filter out all mixed data sources in add mixed query dropdown (#20990)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-12-10 23:17:55 +01:00 committed by GitHub
parent 7d6bd78e0b
commit 72ee1b9a94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/dashboard/panel_editor/QueriesTab.tsx
View File

@ -188,9 +188,13 @@ export class QueriesTab extends PureComponent<Props, State> {
};
renderMixedPicker = () => {
// We cannot filter on mixed flag as some mixed data sources like external plugin
// meta queries data source is mixed but also supports it's own queries
const filteredDsList = this.datasources.filter(ds => ds.meta.id !== 'mixed');
return (
<DataSourcePicker
datasources={this.datasources.filter(ds => !ds.meta.mixed)}
datasources={filteredDsList}
onChange={this.onAddMixedQuery}
current={null}
autoFocus={true}