Skip to content

Commit fde9c04

Browse files
winfredLINwinfredLIN
authored
Merge pull request #3129 from actiontech/add_audit_plan_collect_metrics
Add audit plan collect metrics
2 parents fb851dc + 7bd158e commit fde9c04

File tree

4 files changed

+96
-27
lines changed

4 files changed

+96
-27
lines changed

‎sqle/locale/active.en.toml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ ApMetaCustom = "Custom"
2222
ApMetaDB2TopSQL = "DB2 Top SQL"
2323
ApMetaDistributedLock = "Distributed Lock"
2424
ApMetaDmTopSQL = "DM TOP SQL"
25+
ApMetaGoldenDBTopSQL = "GoldenDB TOP SQL"
2526
ApMetaHuaweiRdsMySQLSlowLog = "Huawei Cloud RDS MySQL slow log"
2627
ApMetaMDBSlowLog = "slow log(Monitor DB)"
2728
ApMetaMySQLProcesslist = "Processlist"
2829
ApMetaMySQLSchemaMeta = "Database schema metadata"
30+
ApMetaMySQLTopSQL = "MySQL TOP SQL"
2931
ApMetaObForOracleTopSQL = "OceanBase For Oracle TOP SQL"
3032
ApMetaOracleTopSQL = "Oracle TOP SQL"
3133
ApMetaPerformanceCollect = "Performance metrics"
@@ -36,6 +38,7 @@ ApMetaSchemaMeta = "Database schema metadata"
3638
ApMetaSlowLog = "Slow log"
3739
ApMetaThreadsConnected = "ThreadsConnected"
3840
ApMetaTiDBAuditLog = "TiDB audit log"
41+
ApMetaTiDBTopSQL = "TiDB TOP SQL"
3942
ApMetaTopSQL = "Top SQL"
4043
ApMetricEngine = "engine"
4144
ApMetricNameActiveTimeTotal = "Total active time (ms)"
@@ -48,14 +51,17 @@ ApMetricNameChecksum = "checksum"
4851
ApMetricNameCounter = "Execution count"
4952
ApMetricNameCounterMoreThan = "Occurrence count > "
5053
ApMetricNameDBUser = "User"
54+
ApMetricNameDiskMax = "Maximum disk space used"
5155
ApMetricNameDiskReadAvg = "Average physical read count"
5256
ApMetricNameDiskReadTotal = "Physical read count"
5357
ApMetricNameFirstQueryAt = "First execution time"
58+
ApMetricNameFullTableScanCount = "Full table scan count"
5459
ApMetricNameGrantedLockConnectionId = "granted lock connection id"
5560
ApMetricNameGrantedLockId = "granted lock id"
5661
ApMetricNameGrantedLockSql = "granted lock SQL"
5762
ApMetricNameGrantedLockTrxId = "granted lock transaction id"
5863
ApMetricNameHost = "host"
64+
ApMetricNameInstance = "Node address"
5965
ApMetricNameIoWaitTimeAvg = "Average IO wait time (ms)"
6066
ApMetricNameLastQueryAt = "Last execution time"
6167
ApMetricNameLastReceiveTimestamp = "Last time matched to fingerprint"
@@ -67,8 +73,10 @@ ApMetricNameLockWaitTimeMax = "Max lock wait time(ms)"
6773
ApMetricNameLockWaitTimeTotal = "Total lock wait time (ms)"
6874
ApMetricNameLogicReadPageTotal = "Total logical read pages"
6975
ApMetricNameMaxQueryTime = "Max execution time"
76+
ApMetricNameMemMax = "Maximum memory used"
7077
ApMetricNameMetaName = "Object name"
7178
ApMetricNameMetaType = "Object type"
79+
ApMetricNameNoIndexUsedTotal = "Unused-index count"
7280
ApMetricNamePhyReadPageTotal = "Physical read pages"
7381
ApMetricNameQueryTimeAvg = "Average execution time(s)"
7482
ApMetricNameQueryTimeAvgMS = "Average execution time(ms)"
@@ -108,8 +116,15 @@ ConfigFeishuTestContent = "This is a test approval, used to test whether the SQL
108116
ConfigTestAudit = "Test approval"
109117
DefaultRuleTemplatesDesc = "Default rule template"
110118
DefaultTemplatesDesc = "%s default template"
119+
EnumKpiTypeDiskMax = "Maximum disk space used"
120+
EnumKpiTypeExecuteCount = "Execution count"
121+
EnumKpiTypeFullTableScan = "Full table scan count"
122+
EnumKpiTypeLockWaitTotal = "Total lock wait time"
123+
EnumKpiTypeMemMax = "Maximum memory used"
124+
EnumKpiTypeNoIndexUsedTotal = "Unused-index count"
111125
EnumSlowLogFileSource = "Collected from slow.log file, need to adapt scanner"
112126
EnumSlowLogTableSource = "Collected from mysql.slow_log table"
127+
EnumkpiTypeQueryTime = "Execution time"
113128
ExportCreateTime = "Created time"
114129
ExportCreator = "Creator"
115130
ExportDataSource = "Db instance"
@@ -267,14 +282,17 @@ ParamDBInstanceId = "DB Instance ID"
267282
ParamFirstCollectDurationWithMaxDays = "Log collection time range when starting task (unit: hour, max %d days)"
268283
ParamFirstSqlsScrappedHours = "Slow log collection time range when starting task (unit: hour, only for mysql.slow_log)"
269284
ParamIndicator = "Indicator"
285+
ParamInstance = "Node address（0 means all nodes）"
270286
ParamOrderByColumn = "Sort Column in V$SQLAREA"
271287
ParamOrderByColumnGeneric = "Sort Column"
272288
ParamProjectId = "Project ID"
273289
ParamRdsPath = "RDS Open API Address"
274290
ParamRegion = "Region of current RDS Instance (Example: cn-east-2)"
275291
ParamSQLMinSecond = "SQL Minimum Execution Time (Second)"
276292
ParamSlowLogCollectInput = "Collect Source"
293+
ParamTimeSpan = "Time span（hours）"
277294
ParamTopN = "Top N"
295+
ParamkpiType = "Metrics"
278296
PipelineCmdUsage = "#Usage#\n1. Ensure the user running this command has execution permission for scannerd.\n2. Execute the start command in the directory where the scannerd file is located.\n#Start Command#\n"
279297
RuleLevelError = "Error"
280298
RuleLevelNormal = "Normal"

‎sqle/locale/active.zh.toml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ ApMetaCustom = "自定义"
2222
ApMetaDB2TopSQL = "DB2 Top SQL"
2323
ApMetaDistributedLock = "分布式锁"
2424
ApMetaDmTopSQL = "DM TOP SQL"
25+
ApMetaGoldenDBTopSQL = "GoldenDB TOP SQL"
2526
ApMetaHuaweiRdsMySQLSlowLog = "华为云RDS MySQL慢日志"
2627
ApMetaMDBSlowLog = "慢日志（监控库）"
2728
ApMetaMySQLProcesslist = "processlist 列表"
2829
ApMetaMySQLSchemaMeta = "库表元数据"
30+
ApMetaMySQLTopSQL = "MySQL TOP SQL"
2931
ApMetaObForOracleTopSQL = "OceanBase For Oracle TOP SQL"
3032
ApMetaOracleTopSQL = "Oracle TOP SQL"
3133
ApMetaPerformanceCollect = "数据源性能指标"
@@ -36,6 +38,7 @@ ApMetaSchemaMeta = "库表元数据"
3638
ApMetaSlowLog = "慢日志"
3739
ApMetaThreadsConnected = "线程数"
3840
ApMetaTiDBAuditLog = "TiDB审计日志"
41+
ApMetaTiDBTopSQL = "TiDB TOP SQL"
3942
ApMetaTopSQL = "Top SQL"
4043
ApMetricEngine = "引擎"
4144
ApMetricNameActiveTimeTotal = "活动总时间(ms)"
@@ -48,14 +51,17 @@ ApMetricNameChecksum = "校验和"
4851
ApMetricNameCounter = "执行次数"
4952
ApMetricNameCounterMoreThan = "出现次数 > "
5053
ApMetricNameDBUser = "用户"
54+
ApMetricNameDiskMax = "使用的最大硬盘空间"
5155
ApMetricNameDiskReadAvg = "平均物理读次数"
5256
ApMetricNameDiskReadTotal = "物理读次数"
5357
ApMetricNameFirstQueryAt = "首次执行时间"
58+
ApMetricNameFullTableScanCount = "全表扫描次数"
5459
ApMetricNameGrantedLockConnectionId = "持有锁连接ID"
5560
ApMetricNameGrantedLockId = "持有锁ID"
5661
ApMetricNameGrantedLockSql = "持有锁SQL"
5762
ApMetricNameGrantedLockTrxId = "持有锁事务ID"
5863
ApMetricNameHost = "主机"
64+
ApMetricNameInstance = "节点地址"
5965
ApMetricNameIoWaitTimeAvg = "平均IO等待时间(毫秒)"
6066
ApMetricNameLastQueryAt = "最后执行时间"
6167
ApMetricNameLastReceiveTimestamp = "最后一次匹配到该指纹的时间"
@@ -67,8 +73,10 @@ ApMetricNameLockWaitTimeMax = "锁最大等待时间(ms)"
6773
ApMetricNameLockWaitTimeTotal = "锁等待时间(ms)"
6874
ApMetricNameLogicReadPageTotal = "逻辑读页数"
6975
ApMetricNameMaxQueryTime = "最长执行时间(s)"
76+
ApMetricNameMemMax = "使用的最大内存空间"
7077
ApMetricNameMetaName = "对象名称"
7178
ApMetricNameMetaType = "对象类型"
79+
ApMetricNameNoIndexUsedTotal = "累计未使用索引次数"
7280
ApMetricNamePhyReadPageTotal = "物理读页数"
7381
ApMetricNameQueryTimeAvg = "平均执行时间(s)"
7482
ApMetricNameQueryTimeAvgMS = "平均执行时间(ms)"
@@ -108,8 +116,15 @@ ConfigFeishuTestContent = "这是一条测试审批,用来测试SQLE飞书审批
108116
ConfigTestAudit = "测试审批"
109117
DefaultRuleTemplatesDesc = "默认规则模板"
110118
DefaultTemplatesDesc = "%s 默认模板"
119+
EnumKpiTypeDiskMax = "使用的最大硬盘空间"
120+
EnumKpiTypeExecuteCount = "执行次数"
121+
EnumKpiTypeFullTableScan = "全表扫描次数"
122+
EnumKpiTypeLockWaitTotal = "累计锁等待时间"
123+
EnumKpiTypeMemMax = "使用的最大内存空间"
124+
EnumKpiTypeNoIndexUsedTotal = "累计未使用索引次数"
111125
EnumSlowLogFileSource = "从slow.log 文件采集,需要适配scanner"
112126
EnumSlowLogTableSource = "从mysql.slow_log 表采集"
127+
EnumkpiTypeQueryTime = "执行时间"
113128
ExportCreateTime = "创建时间"
114129
ExportCreator = "创建人"
115130
ExportDataSource = "数据源"
@@ -157,7 +172,7 @@ NotifyManageRecordBodyRecord = "- SQL ID: %v\n- 所在数据源名称: %v\n- 环
157172
NotifyManageRecordBodyTime = "记录时间周期: %v - %v"
158173
NotifyManageRecordSubject = "SQL管控记录"
159174
NotifyWorkflowBodyConfigUrl = "请在系统设置-全局配置中补充全局url"
160-
NotifyWorkflowBodyHead = "\n- 工单主题: %v\n- 所属项目: %v\n- 工单ID: %v\n- 工单描述: %v\n- 申请人: %v\n- 创建时间: %v"
175+
NotifyWorkflowBodyHead = "\n- 工单主题: %v\n 所属项目： %v\n- 工单ID: %v\n- 工单描述: %v\n- 申请人: %v\n- 创建时间: %v"
161176
NotifyWorkflowBodyInstanceAndSchema = "- 数据源: %v\n- schema: %v"
162177
NotifyWorkflowBodyInstanceErr = "获取数据源实例失败: %v\n"
163178
NotifyWorkflowBodyLink = "- 工单链接: %v"
@@ -267,14 +282,17 @@ ParamDBInstanceId = "实例ID"
267282
ParamFirstCollectDurationWithMaxDays = "启动任务时拉取日志时间范围(单位:小时,最大%d天)"
268283
ParamFirstSqlsScrappedHours = "启动任务时拉取慢日志时间范围(单位:小时，仅对 mysql.slow_log 有效)"
269284
ParamIndicator = "关注指标"
285+
ParamInstance = "节点地址（0 代表所有节点）"
270286
ParamOrderByColumn = "V$SQLAREA中的排序字段"
271287
ParamOrderByColumnGeneric = "排序字段"
272288
ParamProjectId = "项目ID"
273289
ParamRdsPath = "RDS Open API地址"
274290
ParamRegion = "当前RDS实例所在的地区（示例：cn-east-2）"
275291
ParamSQLMinSecond = "SQL 最小执行时间（秒）"
276292
ParamSlowLogCollectInput = "采集来源"
293+
ParamTimeSpan = "时间跨度（小时）"
277294
ParamTopN = "Top N"
295+
ParamkpiType = "指标"
278296
PipelineCmdUsage = "#使用方法#\n1. 确保运行该命令的用户具有scannerd的执行权限。\n2. 在scannerd文件所在目录执行启动命令。\n#启动命令#\n"
279297
RuleLevelError = "错误"
280298
RuleLevelNormal = "常规"

‎sqle/locale/message_zh.go‎

Lines changed: 46 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -356,37 +356,46 @@ var (
356356
ApMetricNameRowsAffectedMax = &i18n.Message{ID: "ApMetricNameRowsAffectedMax", Other: "最大影响行数"}
357357
ApMetricNameRowsAffectedAvg = &i18n.Message{ID: "ApMetricNameRowsAffectedAvg", Other: "平均影响行数"}
358358
ApMetricNameChecksum = &i18n.Message{ID: "ApMetricNameChecksum", Other: "校验和"}
359+
ApMetricNameNoIndexUsedTotal = &i18n.Message{ID: "ApMetricNameNoIndexUsedTotal", Other: "累计未使用索引次数"}
359360

360361
ApMetricNameCounterMoreThan = &i18n.Message{ID: "ApMetricNameCounterMoreThan", Other: "出现次数 > "}
361362
ApMetricNameQueryTimeAvgMoreThan = &i18n.Message{ID: "ApMetricNameQueryTimeAvgMoreThan", Other: "平均执行时间(s) > "}
362363
ApMetricNameRowExaminedAvgMoreThan = &i18n.Message{ID: "ApMetricNameRowExaminedAvgMoreThan", Other: "平均扫描行数 > "}
363364

364-
ApMetaCustom = &i18n.Message{ID: "ApMetaCustom", Other: "自定义"}
365-
ApMetaMySQLSchemaMeta = &i18n.Message{ID: "ApMetaMySQLSchemaMeta", Other: "库表元数据"}
366-
ApMetaMySQLProcesslist = &i18n.Message{ID: "ApMetaMySQLProcesslist", Other: "processlist 列表"}
367-
ApMetaAliRdsMySQLSlowLog = &i18n.Message{ID: "ApMetaAliRdsMySQLSlowLog", Other: "阿里RDS MySQL慢日志"}
368-
ApMetaAliRdsMySQLAuditLog = &i18n.Message{ID: "ApMetaAliRdsMySQLAuditLog", Other: "阿里RDS MySQL审计日志"}
369-
ApMetaBaiduRdsMySQLSlowLog = &i18n.Message{ID: "ApMetaBaiduRdsMySQLSlowLog", Other: "百度云RDS MySQL慢日志"}
370-
ApMetaHuaweiRdsMySQLSlowLog = &i18n.Message{ID: "ApMetaHuaweiRdsMySQLSlowLog", Other: "华为云RDS MySQL慢日志"}
371-
ApMetaOracleTopSQL = &i18n.Message{ID: "ApMetaOracleTopSQL", Other: "Oracle TOP SQL"}
372-
ApMetaAllAppExtract = &i18n.Message{ID: "ApMetaAllAppExtract", Other: "应用程序SQL抓取"}
373-
ApMetaTiDBAuditLog = &i18n.Message{ID: "ApMetaTiDBAuditLog", Other: "TiDB审计日志"}
374-
ApMetaSlowLog = &i18n.Message{ID: "ApMetaSlowLog", Other: "慢日志"}
375-
ApMetaMDBSlowLog = &i18n.Message{ID: "ApMetaMDBSlowLog", Other: "慢日志（监控库）"}
376-
ApMetaTopSQL = &i18n.Message{ID: "ApMetaTopSQL", Other: "Top SQL"}
377-
ApMetaDB2TopSQL = &i18n.Message{ID: "ApMetaDB2TopSQL", Other: "DB2 Top SQL"}
378-
ApMetaSchemaMeta = &i18n.Message{ID: "ApMetaSchemaMeta", Other: "库表元数据"}
379-
ApMetaDistributedLock = &i18n.Message{ID: "ApMetaDistributedLock", Other: "分布式锁"}
380-
ApMetaDmTopSQL = &i18n.Message{ID: "ApMetaDmTopSQL", Other: "DM TOP SQL"}
381-
ApMetaObForOracleTopSQL = &i18n.Message{ID: "ApMetaObForOracleTopSQL", Other: "OceanBase For Oracle TOP SQL"}
382-
ApMetaPostgreSQLTopSQL = &i18n.Message{ID: "ApMetaPostgreSQLTopSQL", Other: "TOP SQL"}
383-
ApMetricQueryTimeAvg = &i18n.Message{ID: "ApMetricQueryTimeAvg", Other: "平均查询时间(s)"}
384-
ApMetricRowExaminedAvg = &i18n.Message{ID: "ApMetricRowExaminedAvg", Other: "平均扫描行数"}
385-
ApMetaPerformanceCollect = &i18n.Message{ID: "ApMetaPerformanceCollect", Other: "数据源性能指标"}
386-
ApMetaPerformanceCollectTips = &i18n.Message{ID: "ApMetaPerformanceCollectTips", Other: "性能指标采集将产生较大性能开销,请谨慎开启。开启后,系统将持续采集该数据源的性能数据(如QPS、连接数等)，并生成性能趋势图表，体现在性能洞察页面。"}
387-
ApMetaCollectTime = &i18n.Message{ID: "ApMetaCollectTime", Other: "采集时间"}
388-
ApMetaThreadsConnected = &i18n.Message{ID: "ApMetaThreadsConnected", Other: "线程数"}
389-
ApMetaQPS = &i18n.Message{ID: "ApMetaQueries", Other: "QPS"}
365+
ApMetricNameInstance = &i18n.Message{ID: "ApMetricNameInstance", Other: "节点地址"}
366+
ApMetricNameMemMax = &i18n.Message{ID: "ApMetricNameMemMax", Other: "使用的最大内存空间"}
367+
ApMetricNameDiskMax = &i18n.Message{ID: "ApMetricNameDiskMax", Other: "使用的最大硬盘空间"}
368+
369+
ApMetaCustom = &i18n.Message{ID: "ApMetaCustom", Other: "自定义"}
370+
ApMetaMySQLSchemaMeta = &i18n.Message{ID: "ApMetaMySQLSchemaMeta", Other: "库表元数据"}
371+
ApMetaMySQLProcesslist = &i18n.Message{ID: "ApMetaMySQLProcesslist", Other: "processlist 列表"}
372+
ApMetaAliRdsMySQLSlowLog = &i18n.Message{ID: "ApMetaAliRdsMySQLSlowLog", Other: "阿里RDS MySQL慢日志"}
373+
ApMetaAliRdsMySQLAuditLog = &i18n.Message{ID: "ApMetaAliRdsMySQLAuditLog", Other: "阿里RDS MySQL审计日志"}
374+
ApMetaBaiduRdsMySQLSlowLog = &i18n.Message{ID: "ApMetaBaiduRdsMySQLSlowLog", Other: "百度云RDS MySQL慢日志"}
375+
ApMetaHuaweiRdsMySQLSlowLog = &i18n.Message{ID: "ApMetaHuaweiRdsMySQLSlowLog", Other: "华为云RDS MySQL慢日志"}
376+
ApMetaOracleTopSQL = &i18n.Message{ID: "ApMetaOracleTopSQL", Other: "Oracle TOP SQL"}
377+
ApMetaAllAppExtract = &i18n.Message{ID: "ApMetaAllAppExtract", Other: "应用程序SQL抓取"}
378+
ApMetaTiDBAuditLog = &i18n.Message{ID: "ApMetaTiDBAuditLog", Other: "TiDB审计日志"}
379+
ApMetaSlowLog = &i18n.Message{ID: "ApMetaSlowLog", Other: "慢日志"}
380+
ApMetaMDBSlowLog = &i18n.Message{ID: "ApMetaMDBSlowLog", Other: "慢日志（监控库）"}
381+
ApMetaTopSQL = &i18n.Message{ID: "ApMetaTopSQL", Other: "Top SQL"}
382+
ApMetaDB2TopSQL = &i18n.Message{ID: "ApMetaDB2TopSQL", Other: "DB2 Top SQL"}
383+
ApMetaSchemaMeta = &i18n.Message{ID: "ApMetaSchemaMeta", Other: "库表元数据"}
384+
ApMetaDistributedLock = &i18n.Message{ID: "ApMetaDistributedLock", Other: "分布式锁"}
385+
ApMetaDmTopSQL = &i18n.Message{ID: "ApMetaDmTopSQL", Other: "DM TOP SQL"}
386+
ApMetaObForOracleTopSQL = &i18n.Message{ID: "ApMetaObForOracleTopSQL", Other: "OceanBase For Oracle TOP SQL"}
387+
ApMetaPostgreSQLTopSQL = &i18n.Message{ID: "ApMetaPostgreSQLTopSQL", Other: "TOP SQL"}
388+
ApMetaGoldenDBTopSQL = &i18n.Message{ID: "ApMetaGoldenDBTopSQL", Other: "GoldenDB TOP SQL"}
389+
ApMetaTiDBTopSQL = &i18n.Message{ID: "ApMetaTiDBTopSQL", Other: "TiDB TOP SQL"}
390+
ApMetaMySQLTopSQL = &i18n.Message{ID: "ApMetaMySQLTopSQL", Other: "MySQL TOP SQL"}
391+
ApMetricQueryTimeAvg = &i18n.Message{ID: "ApMetricQueryTimeAvg", Other: "平均查询时间(s)"}
392+
ApMetricRowExaminedAvg = &i18n.Message{ID: "ApMetricRowExaminedAvg", Other: "平均扫描行数"}
393+
ApMetaPerformanceCollect = &i18n.Message{ID: "ApMetaPerformanceCollect", Other: "数据源性能指标"}
394+
ApMetaPerformanceCollectTips = &i18n.Message{ID: "ApMetaPerformanceCollectTips", Other: "性能指标采集将产生较大性能开销,请谨慎开启。开启后,系统将持续采集该数据源的性能数据(如QPS、连接数等)，并生成性能趋势图表，体现在性能洞察页面。"}
395+
ApMetaCollectTime = &i18n.Message{ID: "ApMetaCollectTime", Other: "采集时间"}
396+
ApMetaThreadsConnected = &i18n.Message{ID: "ApMetaThreadsConnected", Other: "线程数"}
397+
ApMetaQPS = &i18n.Message{ID: "ApMetaQueries", Other: "QPS"}
398+
ApMetricNameFullTableScanCount = &i18n.Message{ID: "ApMetricNameFullTableScanCount", Other: "全表扫描次数"}
390399

391400
ApPriorityHigh = &i18n.Message{ID: "ApPriorityHigh", Other: "高优先级"}
392401

@@ -409,6 +418,17 @@ var (
409418
ParamRdsPath = &i18n.Message{ID: "ParamRdsPath", Other: "RDS Open API地址"}
410419
ParamProjectId = &i18n.Message{ID: "ParamProjectId", Other: "项目ID"}
411420
ParamRegion = &i18n.Message{ID: "ParamRegion", Other: "当前RDS实例所在的地区（示例：cn-east-2）"}
421+
ParamTimeSpan = &i18n.Message{ID: "ParamTimeSpan", Other: "时间跨度（小时）"}
422+
ParamInstance = &i18n.Message{ID: "ParamInstance", Other: "节点地址（0 代表所有节点）"}
423+
ParamKpiType = &i18n.Message{ID: "ParamkpiType", Other: "指标"}
424+
425+
EnumKpiTypeQueryTime = &i18n.Message{ID: "EnumkpiTypeQueryTime", Other: "执行时间"}
426+
EnumKpiTypeMemMax = &i18n.Message{ID: "EnumKpiTypeMemMax", Other: "使用的最大内存空间"}
427+
EnumKpiTypeDiskMax = &i18n.Message{ID: "EnumKpiTypeDiskMax", Other: "使用的最大硬盘空间"}
428+
EnumKpiTypeExecuteCount = &i18n.Message{ID: "EnumKpiTypeExecuteCount", Other: "执行次数"}
429+
EnumKpiTypeFullTableScanCount = &i18n.Message{ID: "EnumKpiTypeFullTableScan", Other: "全表扫描次数"}
430+
EnumKpiTypeLockWaitTotal = &i18n.Message{ID: "EnumKpiTypeLockWaitTotal", Other: "累计锁等待时间"}
431+
EnumKpiTypeNoIndexUsedTotal = &i18n.Message{ID: "EnumKpiTypeNoIndexUsedTotal", Other: "累计未使用索引次数"}
412432

413433
EnumSlowLogFileSource = &i18n.Message{ID: "EnumSlowLogFileSource", Other: "从slow.log 文件采集,需要适配scanner"}
414434
EnumSlowLogTableSource = &i18n.Message{ID: "EnumSlowLogTableSource", Other: "从mysql.slow_log 表采集"}

‎sqle/server/auditplan/metrics.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,13 @@ const MetricNameExplainCost = "explain_cost"
4141

4242
const MetricNameLockTimeAvg string = "lock_time_avg" // 平均锁等待时间
4343
const MetricNameLockTimeMax string = "lock_time_max" // 最大锁等待时间
44+
const MetricNameLockWaitTotal string = "lock_wait_total" // 累计锁等待时间
4445
const MetricNameRowsAffectedMax string = "rows_affected_max" // 最大影响的行数
4546
const MetricNameRowsAffectedAvg string = "rows_affected_avg" // 平均影响的行数
4647
const MetricNameChecksum string = "checksum" // 校验和
4748

49+
const MetricNameNoIndexUsedTotal string = "no_index_used_total" // 累计未使用索引次数
50+
4851
// Lock
4952
const MetricNameGrantedLockId string = "granted_lock_id"
5053
const MetricNameWaitingLockId string = "waiting_lock_id"
@@ -71,6 +74,11 @@ const MetricNameSqlInsightThreadsConnected = "Threads_connected"
7174
const MetricNameSqlInsightQueries = "Queries"
7275
const MetricNameSqlInsightQPS = "QPS"
7376

77+
const MetricNameInstance = "instance"
78+
const MetricNameMemMax = "mem_max"
79+
const MetricNameDiskMax = "disk_max"
80+
const MetricNameFullTableScanCount = "full_table_scan_count"
81+
7482
var ALLMetric = map[string]MetricType{
7583
MetricNameCounter: MetricTypeInt, // MySQL slow log
7684
MetricNameLastReceiveTimestamp: MetricTypeString, // MySQL slow log
@@ -118,6 +126,11 @@ var ALLMetric = map[string]MetricType{
118126
MetricNameSqlInsightThreadsConnected: MetricTypeInt,
119127
MetricNameSqlInsightQueries: MetricTypeInt,
120128
MetricNameSqlInsightQPS: MetricTypeFloat,
129+
130+
MetricNameMemMax: MetricTypeInt,
131+
MetricNameDiskMax: MetricTypeInt,
132+
MetricNameInstance: MetricTypeString,
133+
MetricNameFullTableScanCount: MetricTypeInt,
121134
}
122135

123136
func LoadMetrics(info map[string]interface{}, metrics []string) Metrics {

0 commit comments

Comments
 (0)