-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(mysql): 端口3306的mysql配置文件路径错误 #7541
- Loading branch information
Showing
17 changed files
with
495 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 33 additions & 32 deletions
65
dbm-services/mysql/db-tools/mysql-monitor/items-config.sql
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
dbm-services/mysql/db-tools/mysql-monitor/pkg/itemscollect/ibdstatistic/report_log.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package ibdstatistic | ||
|
|
||
| import ( | ||
| "dbm-services/mysql/db-tools/mysql-monitor/pkg/config" | ||
| "dbm-services/mysql/db-tools/mysql-monitor/pkg/internal/cst" | ||
| "encoding/json" | ||
| "fmt" | ||
| "log/slog" | ||
| "os" | ||
| "path/filepath" | ||
| "slices" | ||
| "time" | ||
|
|
||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| type tableSizeStruct struct { | ||
| BkCloudId int `json:"bk_cloud_id"` | ||
| BkBizId int `json:"bk_biz_id"` | ||
| ImmuteDomain string `json:"cluster_domain"` | ||
| DBModule int `json:"db_module"` | ||
| MachineType string `json:"machine_type"` | ||
| Ip string `json:"instance_host"` | ||
| Port int `json:"instance_port"` | ||
| Role string `json:"instance_role"` | ||
| ServiceInstanceId int64 `json:"bk_target_service_instance_id"` | ||
| OriginalDBName string `json:"original_database_name"` | ||
| DBName string `json:"database_name"` | ||
| DBSize int64 `json:"database_size"` | ||
| TableName string `json:"table_name"` | ||
| TableSize int64 `json:"table_size"` | ||
| } | ||
|
|
||
| func reportLog(result map[string]map[string]int64) error { | ||
| dbsizeReportBaseDir := filepath.Join(cst.DBAReportBase, "mysql/dbsize") | ||
| err := os.MkdirAll(dbsizeReportBaseDir, os.ModePerm) | ||
| if err != nil { | ||
| slog.Error("failed to create database size reports directory", slog.String("error", err.Error())) | ||
| return errors.Wrap(err, "failed to create database size reports directory") | ||
| } | ||
|
|
||
| filePath := filepath.Join( | ||
| dbsizeReportBaseDir, | ||
| fmt.Sprintf(`report.log.%d`, time.Now().Weekday()), | ||
| ) | ||
| err = os.RemoveAll(filePath) | ||
| if err != nil { | ||
| slog.Error("failed to remove database size reports directory", slog.String("error", err.Error())) | ||
| return errors.Wrap(err, "failed to remove database size reports directory") | ||
| } | ||
|
|
||
| f, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666) | ||
| if err != nil { | ||
| slog.Error("failed to open log file", "file", filePath) | ||
| return errors.Wrap(err, "failed to open file") | ||
| } | ||
| defer func() { | ||
| _ = f.Close() | ||
| }() | ||
|
|
||
| for originalDBName, dbInfo := range result { | ||
| // 根据 dbm 枚举约定, remote 是 tendbcluster 的存储机器类型 | ||
| dbName := originalDBName | ||
| if config.MonitorConfig.MachineType == "remote" && slices.Index(systemDBs, originalDBName) < 0 { | ||
| match := tenDBClusterDbNamePattern.FindStringSubmatch(originalDBName) | ||
| if match == nil { | ||
| err := errors.Errorf( | ||
| "invalid dbname: '%s' on %s", | ||
| originalDBName, config.MonitorConfig.MachineType, | ||
| ) | ||
| slog.Error("ibd-statistic report", slog.String("error", err.Error())) | ||
| return err | ||
| } | ||
| dbName = match[1] | ||
| } | ||
|
|
||
| var dbSize int64 | ||
| var tablesInfo []tableSizeStruct | ||
| for tableName, tableSize := range dbInfo { | ||
| tablesInfo = append(tablesInfo, tableSizeStruct{ | ||
| BkCloudId: *config.MonitorConfig.BkCloudID, | ||
| BkBizId: config.MonitorConfig.BkBizId, | ||
| ImmuteDomain: config.MonitorConfig.ImmuteDomain, | ||
| DBModule: *config.MonitorConfig.DBModuleID, | ||
| MachineType: config.MonitorConfig.MachineType, | ||
| Ip: config.MonitorConfig.Ip, | ||
| Port: config.MonitorConfig.Port, | ||
| Role: *config.MonitorConfig.Role, | ||
| ServiceInstanceId: config.MonitorConfig.BkInstanceId, | ||
| OriginalDBName: originalDBName, | ||
| DBName: dbName, | ||
| DBSize: 0, | ||
| TableName: tableName, | ||
| TableSize: tableSize, | ||
| }) | ||
| dbSize += tableSize | ||
| } | ||
|
|
||
| for _, row := range tablesInfo { | ||
| row.DBSize = dbSize | ||
| b, err := json.Marshal(row) | ||
| if err != nil { | ||
| slog.Error("ibd-statistic report", slog.String("error", err.Error())) | ||
| return errors.Wrap(err, "failed to marshal row") | ||
| } | ||
|
|
||
| b = append(b, '\n') | ||
| _, err = f.Write(b) | ||
| if err != nil { | ||
| slog.Error("ibd-statistic report", slog.String("error", err.Error())) | ||
| return errors.Wrap(err, "failed to write row") | ||
| } | ||
| } | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.