Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle variations in the user_statistics collecting #4306

Merged
merged 8 commits into from
Jun 30, 2018
Prev Previous commit
Next Next commit
Consolidate process list stats gathering
  • Loading branch information
glinton committed Jun 19, 2018
commit aa5ded152af9ce6630a688828eaf86c20f30d08a
50 changes: 23 additions & 27 deletions plugins/inputs/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -760,33 +760,6 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
if len(fields) > 0 {
acc.AddFields("mysql", fields, tags)
}
// gather connection metrics from processlist for each user
if m.GatherProcessList {
// get count of connections from each user
conn_rows, err := db.Query("SELECT user, sum(1) AS connections FROM INFORMATION_SCHEMA.PROCESSLIST GROUP BY user")
if err != nil {
log.Printf("E! MySQL Error gathering process list: %s", err)
} else {
for conn_rows.Next() {
var user string
var connections int64

err = conn_rows.Scan(&user, &connections)
if err != nil {
return err
}

tags := map[string]string{"server": servtag, "user": user}
fields := make(map[string]interface{})

if err != nil {
return err
}
fields["connections"] = connections
acc.AddFields("mysql_users", fields, tags)
}
}
}

return nil
}
Expand Down Expand Up @@ -837,6 +810,29 @@ func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc telegraf.
} else {
acc.AddFields("mysql_process_list", fields, tags)
}

// get count of connections from each user
conn_rows, err := db.Query("SELECT user, sum(1) AS connections FROM INFORMATION_SCHEMA.PROCESSLIST GROUP BY user")
if err != nil {
return err
}

for conn_rows.Next() {
var user string
var connections int64

err = conn_rows.Scan(&user, &connections)
if err != nil {
return err
}

tags := map[string]string{"server": servtag, "user": user}
fields := make(map[string]interface{})

fields["connections"] = connections
acc.AddFields("mysql_users", fields, tags)
}

return nil
}

Expand Down