p17860254
/
categraf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code refactor

This commit is contained in:
Ulric Qin 2022-04-27 11:48:57 +08:00
parent 8fc15dc671
commit a3b7470349
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/input.mysql/mysql.toml
View File

@ -11,7 +11,8 @@ password = "1234"
extra_status_metrics = true extra_status_metrics = true
extra_innodb_metrics = false extra_innodb_metrics = false
gather_process_list = true gather_processlist_processes_by_state = false
gather_processlist_processes_by_user = true
# # timeout # # timeout
# timeout_seconds = 3 # timeout_seconds = 3

9
inputs/mysql/mysql.go
View File

@ -29,9 +29,10 @@ type Instance struct {
Labels map[string]string `toml:"labels"` Labels map[string]string `toml:"labels"`
IntervalTimes int64 `toml:"interval_times"` IntervalTimes int64 `toml:"interval_times"`
ExtraStatusMetrics bool `toml:"extra_status_metrics"` ExtraStatusMetrics bool `toml:"extra_status_metrics"`
ExtraInnodbMetrics bool `toml:"extra_innodb_metrics"` ExtraInnodbMetrics bool `toml:"extra_innodb_metrics"`
GatherProcessList bool `toml:"gather_process_list"` GatherProcessListProcessByState bool `toml:"gather_processlist_processes_by_state"`
GatherProcessListProcessByUser bool `toml:"gather_processlist_processes_by_user"`
validMetrics map[string]struct{} validMetrics map[string]struct{}
dsn string dsn string
@ -234,6 +235,6 @@ func (m *MySQL) gatherOnce(slist *list.SafeList, ins *Instance) {
m.gatherEngineInnodbStatus(slist, ins, db, tags, cache) m.gatherEngineInnodbStatus(slist, ins, db, tags, cache)
m.gatherEngineInnodbStatusCompute(slist, ins, db, tags, cache) m.gatherEngineInnodbStatusCompute(slist, ins, db, tags, cache)
m.gatherBinlog(slist, ins, db, tags, cache) m.gatherBinlog(slist, ins, db, tags, cache)
m.gatherProcesslist(slist, ins, db, tags, cache) m.gatherProcesslistByState(slist, ins, db, tags, cache)
m.gatherProcesslistByUser(slist, ins, db, tags, cache) m.gatherProcesslistByUser(slist, ins, db, tags, cache)
} }

6
inputs/mysql/processlist.go
View File

@ -90,8 +90,8 @@ var (
} }
) )
func (m *MySQL) gatherProcesslist(slist *list.SafeList, ins *Instance, db *sql.DB, globalTags map[string]string, cache map[string]float64) { func (m *MySQL) gatherProcesslistByState(slist *list.SafeList, ins *Instance, db *sql.DB, globalTags map[string]string, cache map[string]float64) {
if !ins.GatherProcessList { if !ins.GatherProcessListProcessByState {
return return
} }
@ -131,7 +131,7 @@ func (m *MySQL) gatherProcesslist(slist *list.SafeList, ins *Instance, db *sql.D
} }
for s, c := range stateCounts { for s, c := range stateCounts {
slist.PushFront(inputs.NewSample("process_list_threads", c, labels, map[string]string{"state": s})) slist.PushFront(inputs.NewSample("processlist_processes_by_state", c, labels, map[string]string{"state": s}))
} }
} }

2
inputs/mysql/processlist_by_user.go
View File

@ -10,7 +10,7 @@ import (
) )
func (m *MySQL) gatherProcesslistByUser(slist *list.SafeList, ins *Instance, db *sql.DB, globalTags map[string]string, cache map[string]float64) { func (m *MySQL) gatherProcesslistByUser(slist *list.SafeList, ins *Instance, db *sql.DB, globalTags map[string]string, cache map[string]float64) {
if !ins.GatherProcessList { if !ins.GatherProcessListProcessByUser {
return return
} }