42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From dfd2f38fd34d300448ed9231377fcf4a0be7d367 Mon Sep 17 00:00:00 2001
|
|
From: zhu-yuncheng <zhuyuncheng@huawei.com>
|
|
Date: Sat, 23 Dec 2023 17:43:18 +0800
|
|
Subject: [PATCH] add httpconnection error catch when connect prometheus
|
|
|
|
---
|
|
vulcanus/database/proxy.py | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/vulcanus/database/proxy.py b/vulcanus/database/proxy.py
|
|
index 94e9883..5753066 100644
|
|
--- a/vulcanus/database/proxy.py
|
|
+++ b/vulcanus/database/proxy.py
|
|
@@ -16,9 +16,9 @@ Author:
|
|
Description: Database proxy
|
|
"""
|
|
from functools import wraps
|
|
-import math
|
|
from datetime import datetime
|
|
from urllib3.exceptions import LocationValueError
|
|
+from requests.exceptions import ConnectionError
|
|
|
|
import sqlalchemy
|
|
from sqlalchemy.exc import SQLAlchemyError, DisconnectionError
|
|
@@ -543,8 +543,12 @@ class PromDbProxy(DataBaseProxy):
|
|
Returns:
|
|
bool: connect succeed or fail
|
|
"""
|
|
-
|
|
- return self._prom.check_prometheus_connection()
|
|
+ connected = False
|
|
+ try:
|
|
+ connected = self._prom.check_prometheus_connection()
|
|
+ except ConnectionError as error:
|
|
+ LOGGER.error(error)
|
|
+ return connected
|
|
|
|
def query(self, host, time_range, metric, label_config=None):
|
|
"""
|
|
--
|
|
Gitee
|