From f36a8e7cedf274d3538c955260e60da5e62755a5 Mon Sep 17 00:00:00 2001 From: xjxia Date: Fri, 22 Nov 2024 14:52:53 +0800 Subject: [PATCH] fix(dbm-services): dbha alarm dimension optimize close #8113 --- .../common/dbha/ha-module/dbmodule/dbmysql/MySQL_detect.go | 1 + dbm-services/common/dbha/ha-module/monitor/monitor.go | 6 +++--- ...45\347\224\265\350\257\235\345\221\212\350\255\246.json" | 2 +- ...ql\345\244\261\350\264\245\347\255\226\347\225\245.json" | 4 ++-- ...ql\346\210\220\345\212\237\347\255\226\347\225\245.json" | 4 ++-- 5 files changed, 9 insertions(+), 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 index c8e40318b4..6e48060366 100644 --- 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 index b5766b487b..18bef9357a 100644 --- 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\344\272\214\346\254\241\346\216\242\346\265\213\345\244\261\350\264\245\347\224\265\350\257\235\345\221\212\350\255\246.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/cloud/dbha\344\272\214\346\254\241\346\216\242\346\265\213\345\244\261\350\264\245\347\224\265\350\257\235\345\221\212\350\255\246.json" index c0a03a35f1..9ba0a0c77a 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/cloud/dbha\344\272\214\346\254\241\346\216\242\346\265\213\345\244\261\350\264\245\347\224\265\350\257\235\345\221\212\350\255\246.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/cloud/dbha\344\272\214\346\254\241\346\216\242\346\265\213\345\244\261\350\264\245\347\224\265\350\257\235\345\221\212\350\255\246.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\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.json" index 1263fe4cd3..33d5182a4d 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\345\244\261\350\264\245\347\255\226\347\225\245.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\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.json" "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.json" index 532fd78957..dfc1668fe6 100644 --- "a/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.json" +++ "b/dbm-ui/backend/db_monitor/tpls/alarm/mysql/Mysql dbha\345\210\207\346\215\242mysql\346\210\220\345\212\237\347\255\226\347\225\245.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",