From 45fbbe8021e7c080e25e83a54a3f9947a46c62aa Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Fri, 7 Dec 2018 11:27:11 +0100
Subject: [PATCH 1/3] initialize empty variables array in constructor so that
 datasources can use the array in explore

---
 public/app/features/templating/template_srv.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts
index 485d244e9ae..74da017bb93 100644
--- a/public/app/features/templating/template_srv.ts
+++ b/public/app/features/templating/template_srv.ts
@@ -17,6 +17,7 @@ export class TemplateSrv {
   constructor() {
     this.builtIns['__interval'] = { text: '1s', value: '1s' };
     this.builtIns['__interval_ms'] = { text: '100', value: '100' };
+    this.variables = [];
   }
 
   init(variables) {

From 68c2d2631e0b3312e2be6ec0aa3c511a1100c629 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Fri, 7 Dec 2018 14:11:40 +0100
Subject: [PATCH 2/3] filter out build in datasources. add unit test

---
 public/app/features/explore/Explore.tsx       |  4 ++-
 public/app/features/plugins/datasource_srv.ts |  5 ++++
 .../plugins/specs/datasource_srv.test.ts      | 26 +++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 8e8d215e8b6..f7d4abf4f46 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -158,7 +158,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
     if (!datasourceSrv) {
       throw new Error('No datasource service passed as props.');
     }
-    const datasources = datasourceSrv.getAll();
+    const datasources = datasourceSrv.getExternal();
     const exploreDatasources = datasources.map(ds => ({
       value: ds.name,
       label: ds.name,
@@ -574,6 +574,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
         'Table',
         {
           format: 'table',
+          resultFormat: 'table',
           instant: true,
           valueWithRefId: true,
         },
@@ -585,6 +586,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
         'Graph',
         {
           format: 'time_series',
+          resultFormat: 'time_series',
           instant: false,
         },
         makeTimeSeriesList
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index d5e4c247073..0d68cbc71ba 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -78,6 +78,11 @@ export class DatasourceSrv {
     return Object.keys(datasources).map(name => datasources[name]);
   }
 
+  getExternal() {
+    const datasources = this.getAll().filter(ds => !ds.meta.builtIn);
+    return _.sortBy(datasources, ['name']);
+  }
+
   getAnnotationSources() {
     const sources = [];
 
diff --git a/public/app/features/plugins/specs/datasource_srv.test.ts b/public/app/features/plugins/specs/datasource_srv.test.ts
index b04e9fa10c2..51b83efb3f5 100644
--- a/public/app/features/plugins/specs/datasource_srv.test.ts
+++ b/public/app/features/plugins/specs/datasource_srv.test.ts
@@ -18,6 +18,32 @@ const templateSrv = {
 describe('datasource_srv', () => {
   const _datasourceSrv = new DatasourceSrv({}, {}, {}, templateSrv);
 
+  describe('when loading external datasources', () => {
+    beforeEach(() => {
+      config.datasources = {
+        buildInDs: {
+          name: 'buildIn',
+          meta: { builtIn: true },
+        },
+        nonBuildIn: {
+          name: 'external1',
+          meta: { builtIn: false },
+        },
+        nonExplore: {
+          name: 'external2',
+          meta: {},
+        },
+      };
+    });
+
+    it('should return list of explore sources', () => {
+      const externalSources = _datasourceSrv.getExternal();
+      expect(externalSources.length).toBe(2);
+      expect(externalSources[0].name).toBe('external1');
+      expect(externalSources[1].name).toBe('external2');
+    });
+  });
+
   describe('when loading metric sources', () => {
     let metricSources;
     const unsortedDatasources = {

From 569f5e8d5edc3993bf824832322c2d2187f6dc85 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Fri, 7 Dec 2018 14:13:05 +0100
Subject: [PATCH 3/3] remove result format. might add this later

---
 public/app/features/explore/Explore.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index f7d4abf4f46..d3c4a832a13 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -574,7 +574,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
         'Table',
         {
           format: 'table',
-          resultFormat: 'table',
           instant: true,
           valueWithRefId: true,
         },
@@ -586,7 +585,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
         'Graph',
         {
           format: 'time_series',
-          resultFormat: 'time_series',
           instant: false,
         },
         makeTimeSeriesList