Elasticsearch: Fix handling of errors when testing data source (#28498) (#28504)

#24999 changed the error response payload, but the test data source
was not adapted to this change and broke the feature of displaying
any errors to the user in the UI. This change should resolve this
problem.

Ref #24999
Ref #28481

(cherry picked from commit c8b7ccc66c)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2020-10-24 01:53:42 +02:00
committed by GitHub
co-authored by Marcus Efraimsson
parent 648a149813
commit 43a1cb25b9
@@ -338,12 +338,8 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
},
(err: any) => {
console.error(err);
if (err.data && err.data.error) {
let message = angular.toJson(err.data.error);
if (err.data.error.reason) {
message = err.data.error.reason;
}
return { status: 'error', message: message };
if (err.message) {
return { status: 'error', message: err.message };
} else {
return { status: 'error', message: err.status };
}