feat(backend): 监控策略维度问题 #6649

TencentBlueKing · Sep 3, 2024 · f1f2f6a · f1f2f6a
1 parent 0765695
commit f1f2f6a
Show file tree

Hide file tree

Showing 42 changed files with 51 additions and 5,770 deletions.
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Ext3 文件过大.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Ext3 文件过大.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL Ext3 文件过大",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(ext3-check)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Monitor 执行异常.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Monitor 执行异常.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL Monitor 执行异常",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(monitor-internal-error)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Routine Definer.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Routine Definer.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL Routine Definer",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(routine-definer)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Slave 同步异常.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Slave 同步异常.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL Slave 同步异常",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -246,7 +246,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(slave-status)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Trigger Definer.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL Trigger Definer.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL Trigger Definer",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(trigger-definer)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL View Definer.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL View Definer.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL View Definer",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(view-definer)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 存储引擎检查.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 存储引擎检查.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 存储引擎检查",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(engine)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 库字符集.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 库字符集.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 库字符集",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(character-consistency)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 日志监控-致命.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 日志监控-致命.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 日志监控-致命",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(mysql-err-critical)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 日志监控-预警.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 日志监控-预警.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 日志监控-预警",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(mysql-err-notice)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 注入.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 注入.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 注入",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(mysql-inject)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 连接失败.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 连接失败.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 连接失败",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "os",
     "type": "monitor",
     "items": [
       {
@@ -36,6 +36,7 @@
               "instance_port",
               "cluster_domain",
               "bk_cloud_id",
+              "bk_target_ip",
               "machine_type",
               "instance_role",
               "appid"
@@ -241,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(db-up)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 连接日志过多.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 连接日志过多.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 连接日志过多",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(mysql-connlog-size)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 配置异常.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 配置异常.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 配置异常",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(mysql-config-diff)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 锁表.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/MySQL 锁表.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "MySQL 锁表",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -222,7 +222,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(mysql-lock-dbm_report_channel)",
-  "version": 24,
+  "version": 25,
   "alert_source": "event",
   "custom_conditions": [],
   "export_at": "2024-05-31T17:47:22+08:00"

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha切换mysql失败策略.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha切换mysql失败策略.json
@@ -237,7 +237,8 @@
     },
     "labels": [
       "DBM",
-      "DBM_MYSQL"
+      "DBM_MYSQL",
+      "DBHA_SWITCH"
     ],
     "app": "",
     "path": "",
@@ -249,7 +250,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "a",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha切换mysql成功策略.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha切换mysql成功策略.json
@@ -237,7 +237,8 @@
     },
     "labels": [
       "DBM",
-      "DBM_MYSQL"
+      "DBM_MYSQL",
+      "DBHA_SWITCH"
     ],
     "app": "",
     "path": "",
@@ -249,7 +250,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "a",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy 后端.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy 后端.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "Proxy 后端",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -242,7 +242,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(proxy-backend)",
-  "version": 22,
+  "version": 23,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy 白名单.json b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Proxy 白名单.json
@@ -6,7 +6,7 @@
     "bk_biz_id": "",
     "name": "Proxy 白名单",
     "source": "dbm",
-    "scenario": "other_rt",
+    "scenario": "component",
     "type": "monitor",
     "items": [
       {
@@ -212,7 +212,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(proxy-user-list-dbm_report_channel)",
-  "version": 24,
+  "version": 25,
   "alert_source": "event",
   "custom_conditions": [],
   "export_at": "2024-05-31T17:47:22+08:00"