From 039fc2964ad876a1e78e1229f389521974aa7f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 18 Oct 2017 12:02:57 +0200
Subject: [PATCH] fix: getting started panel and mark adding data source as
 done, fixes #9568

---
 public/app/plugins/datasource/elasticsearch/datasource.ts | 6 ++++++
 public/app/plugins/panel/gettingstarted/module.ts         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index b165ad4c689..814b6c72da6 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -75,6 +75,12 @@ export class ElasticDatasource {
     return this.request('POST', url, data).then(function(results) {
       results.data.$$config = results.config;
       return results.data;
+    }).catch(err => {
+      if (err.data && err.data.error) {
+        throw {message: 'Elasticsearch error: ' + err.data.error.reason, error: err.data.error};
+      }
+
+      throw err;
     });
   }
 
diff --git a/public/app/plugins/panel/gettingstarted/module.ts b/public/app/plugins/panel/gettingstarted/module.ts
index 43c0a249820..de65bbff20e 100644
--- a/public/app/plugins/panel/gettingstarted/module.ts
+++ b/public/app/plugins/panel/gettingstarted/module.ts
@@ -34,7 +34,7 @@ class GettingStartedPanelCtrl extends PanelCtrl {
       check: () => {
         return $q.when(
           datasourceSrv.getMetricSources().filter(item => {
-            return item.meta.builtIn === false;
+            return item.meta.builtIn !== true;
           }).length > 0
         );
       }