fix(dbm-services): dbha alarm dimension optimize close #8113

TencentBlueKing · Nov 22, 2024 · f36a8e7 · f36a8e7
1 parent 5968e7a
commit f36a8e7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/dbm-services/common/dbha/ha-module/dbmodule/dbmysql/MySQL_detect.go b/dbm-services/common/dbha/ha-module/dbmodule/dbmysql/MySQL_detect.go
@@ -27,6 +27,7 @@ const (
 // 1040:ER_CON_COUNT_ERROR
 // 1044:ER_DBACCESS_DENIED_ERROR
 // 1045:ER_ACCESS_DENIED_ERROR
+// 1226:ER_USER_LIMIT_REACHED
 var IgnoreErrorNumber = []uint16{1040, 1044, 1045}
 
 // MySQLDetectInstance mysql instance detect struct

diff --git a/dbm-services/common/dbha/ha-module/monitor/monitor.go b/dbm-services/common/dbha/ha-module/monitor/monitor.go
@@ -109,12 +109,12 @@ func MonitorSend(content string, info MonitorInfo) error {
 	addDimension := make(map[string]interface{})
 	if info.MonitorInfoType == constvar.MonitorInfoSwitch {
 		// switch monitor information dimension add
-		addDimension["role"] = info.Switch.Role
+		addDimension["instance_role"] = info.Switch.Role
 		addDimension["appid"] = info.Switch.Bzid
 		addDimension["server_ip"] = info.Switch.ServerIp
 		addDimension["server_port"] = info.Switch.ServerPort
 		addDimension["status"] = info.Switch.Status
-		addDimension["cluster"] = info.Switch.Cluster
+		addDimension["cluster_domain"] = info.Switch.Cluster
 		addDimension["machine_type"] = info.Switch.MachineType
 		addDimension["idc"] = info.Switch.IDC
 		addDimension["double_check_id"] = info.Switch.CheckID
@@ -133,7 +133,7 @@ func MonitorSend(content string, info MonitorInfo) error {
 		addDimension["server_ip"] = info.Detect.ServerIp
 		addDimension["server_port"] = info.Detect.ServerPort
 		addDimension["status"] = info.Detect.Status
-		addDimension["cluster"] = info.Detect.Cluster
+		addDimension["cluster_domain"] = info.Detect.Cluster
 		addDimension["machine_type"] = info.Detect.MachineType
 		addDimension["cluster_type"] = info.Detect.ClusterType
 	} else if info.MonitorInfoType == constvar.MonitorInfoGlobal {

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/cloud/dbha二次探测失败电话告警.json b/dbm-ui/backend/db_monitor/tpls/alarm/cloud/dbha二次探测失败电话告警.json
@@ -34,7 +34,7 @@
             "agg_dimension": [
               "cluster_type",
               "appid",
-              "cluster",
+              "cluster_domain",
               "server_ip",
               "server_port",
               "machine_type"

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
@@ -33,10 +33,10 @@
             "agg_interval": 60,
             "agg_dimension": [
               "bk_cloud_id",
-              "cluster",
+              "cluster_domain",
               "idc",
               "machine_type",
-              "role",
+              "instance_role",
               "server_ip",
               "server_port",
               "status",

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
@@ -33,10 +33,10 @@
             "agg_interval": 60,
             "agg_dimension": [
               "bk_cloud_id",
-              "cluster",
+              "cluster_domain",
               "idc",
               "machine_type",
-              "role",
+              "instance_role",
               "server_ip",
               "server_port",
               "status",