From 0991e8cff2dc55e65ec335e9351c8019bc6708dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Fri, 21 Mar 2025 11:20:04 +0100
Subject: [PATCH] Enhance error handling in health check

---
 src/datasource.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/datasource.ts b/src/datasource.ts
index 1cdf5b4..fe59f70 100644
--- a/src/datasource.ts
+++ b/src/datasource.ts
@@ -11,7 +11,7 @@ import {
   TimeRange,
   toDataFrame,
 } from '@grafana/data';
-import { getTemplateSrv } from '@grafana/runtime';
+import { getTemplateSrv, HealthCheckError } from '@grafana/runtime';
 import jsonata from 'jsonata';
 import { JSONPath } from 'jsonpath-plus';
 import { jp } from './jsonpath';
@@ -98,17 +98,20 @@ export class JsonDataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourc
           message: 'Success',
         };
       } else {
-        return {
+        const message = response.statusText ? response.statusText : defaultErrorMessage;
+        return Promise.reject({
           status: 'error',
-          message: response.statusText ? response.statusText : defaultErrorMessage,
-        };
+          message,
+          error: new HealthCheckError(message, {}),
+        });
       }
     } catch (err: any) {
       if (_.isString(err)) {
-        return {
+        return Promise.reject({
           status: 'error',
           message: err,
-        };
+          error: new HealthCheckError(err, {}),
+        });
       } else {
         let message = 'JSON API: ';
         message += err.statusText ? err.statusText : defaultErrorMessage;
@@ -116,10 +119,11 @@ export class JsonDataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourc
           message += ': ' + err.data.error.code + '. ' + err.data.error.message;
         }
 
-        return {
+        return Promise.reject({
           status: 'error',
           message,
-        };
+          error: new HealthCheckError(message, {}),
+        });
       }
     }
   }