fix: 调整sqlserver的告警事件级别 #7066

TencentBlueKing · Sep 23, 2024 · f2e3b94 · f2e3b94
1 parent 73276af
commit f2e3b94
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/sqlserver/Sqlserver-数据库同步状态异常【Alwayson】.json b/dbm-ui/backend/db_monitor/tpls/alarm/sqlserver/Sqlserver-数据库同步状态异常【Alwayson】.json
@@ -49,7 +49,7 @@
         "algorithms": [
           {
             "type": "Threshold",
-            "level": 1,
+            "level": 2,
             "config": [
               [
                 {
@@ -66,7 +66,7 @@
     ],
     "detects": [
       {
-        "level": 1,
+        "level": 2,
         "expression": "",
         "trigger_config": {
           "count": 3,
@@ -254,7 +254,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "MAX(mssql_alwayson_status)",
-  "version": 2,
+  "version": 3,
   "alert_source": "time_series",
   "custom_conditions": [],
   "export_at": "2024-04-02T16:01:58+08:00"

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/sqlserver/Sqlserver-数据库镜像缺失【Alwayson】.json b/dbm-ui/backend/db_monitor/tpls/alarm/sqlserver/Sqlserver-数据库镜像缺失【Alwayson】.json
@@ -49,7 +49,7 @@
         "algorithms": [
           {
             "type": "Threshold",
-            "level": 1,
+            "level": 2,
             "config": [
               [
                 {
@@ -66,7 +66,7 @@
     ],
     "detects": [
       {
-        "level": 1,
+        "level": 2,
         "expression": "",
         "trigger_config": {
           "count": 3,
@@ -249,7 +249,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "MAX(mssql_alwayson_deploy)",
-  "version": 2,
+  "version": 3,
   "alert_source": "time_series",
   "custom_conditions": [],
   "export_at": "2024-04-02T16:01:58+08:00"

diff --git a/dbm-ui/backend/db_services/sqlserver/rollback/handlers.py b/dbm-ui/backend/db_services/sqlserver/rollback/handlers.py
@@ -160,6 +160,7 @@ def query_dbs_by_backup_log(
     def query_last_log_time(self, query_time: datetime):
         """
         查询集群的最近一次上报的备份时间
+        拿最新的一条备份记录的备份开始时间的作为判断依据
         """
         last_binlogs = self._get_log_from_bklog(
             collector="mssql_binlog_result",
@@ -172,7 +173,7 @@ def query_last_log_time(self, query_time: datetime):
         if not last_binlogs:
             raise Exception(_("集群【{}】最近的{}天里找不到日志备份").format(self.cluster.name, BACKUP_LOG_RANGE_DAYS))
 
-        return last_binlogs[0]["backup_end_time"]
+        return last_binlogs[0]["backup_task_start_time"]
 
     @staticmethod
     def check_binlog_lsn_continuity(backup_logs: List[Dict], full_backup_info: Dict) -> (List[Dict], List[str]):