From 8d06e049fbe4859e670876b7a0b1b509eb03916f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Tue, 25 Mar 2025 12:12:40 +0100
Subject: [PATCH] Enhance error handling in health check (#1998)

---
 src/datasource/datasource.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/datasource/datasource.ts b/src/datasource/datasource.ts
index a616689..e4c793f 100644
--- a/src/datasource/datasource.ts
+++ b/src/datasource/datasource.ts
@@ -20,6 +20,7 @@ import {
   getTemplateSrv,
   toDataQueryResponse,
   getDataSourceSrv,
+  HealthCheckError,
 } from '@grafana/runtime';
 import {
   DataFrame,
@@ -775,30 +776,29 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
       };
     } catch (error: any) {
       if (error instanceof ZabbixAPIError) {
-        return {
+        return Promise.reject({
           status: 'error',
-          title: error.message,
           message: error.message,
-        };
+          error: new HealthCheckError(error.message, {}),
+        });
       } else if (error.data && error.data.message) {
-        return {
+        return Promise.reject({
           status: 'error',
-          title: 'Zabbix Client Error',
           message: error.data.message,
-        };
+          error: new HealthCheckError(error.data.message, {}),
+        });
       } else if (typeof error === 'string') {
-        return {
+        return Promise.reject({
           status: 'error',
-          title: 'Unknown Error',
           message: error,
-        };
+          error: new HealthCheckError(error, {}),
+        });
       } else {
-        console.log(error);
-        return {
+        return Promise.reject({
           status: 'error',
-          title: 'Connection failed',
           message: 'Could not connect to given url',
-        };
+          error: new HealthCheckError('Could not connect to given url', {}),
+        });
       }
     }
   }