Merge pull request #3856 from Gueust/elasticsearc_fix_error

Serialize an elasticsearch error previously printed as 'Object'
pull/3864/head
Carl Bergquist 10 years ago
commit 0ea651f1df
  1. 2
      public/app/plugins/datasource/elasticsearch/datasource.js

@ -146,7 +146,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
return { status: "success", message: "Data source is working", title: "Success" }; return { status: "success", message: "Data source is working", title: "Success" };
}, function(err) { }, function(err) {
if (err.data && err.data.error) { if (err.data && err.data.error) {
return { status: "error", message: err.data.error, title: "Error" }; return { status: "error", message: angular.toJson(err.data.error), title: "Error" };
} else { } else {
return { status: "error", message: err.status, title: "Error" }; return { status: "error", message: err.status, title: "Error" };
} }

Loading…
Cancel
Save