From 72ee1b9a949f3f495ac236c2a625d933f56e33b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 10 Dec 2019 23:17:55 +0100
Subject: [PATCH] MixedDatasources: Do not filter out all mixed data sources in
 add mixed query dropdown (#20990)

---
 public/app/features/dashboard/panel_editor/QueriesTab.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/panel_editor/QueriesTab.tsx b/public/app/features/dashboard/panel_editor/QueriesTab.tsx
index 4089daf3282..3d3f82e1d1a 100644
--- a/public/app/features/dashboard/panel_editor/QueriesTab.tsx
+++ b/public/app/features/dashboard/panel_editor/QueriesTab.tsx
@@ -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}