IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 23:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3856 from Gueust/elasticsearc_fix_error

Browse Source 
Serialize an elasticsearch error previously printed as 'Object'
This commit is contained in:
Carl Bergquist 2016-01-27 15:08:00 +01:00
commit 0ea651f1df
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@ -146,7 +146,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
return { status: "success", message: "Data source is working", title: "Success" };
}, function(err) {
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 {
return { status: "error", message: err.status, title: "Error" };
}