remove duplicate function; Mysql plugin GatherTableSchema is configurable

This commit is contained in:
Maksadbek 2016-02-26 01:35:27 +05:00 committed by Cameron Sparr
parent c732abbda2
commit b16bc3d2e3
1 changed files with 8 additions and 9 deletions

View File

@ -24,6 +24,7 @@ type Mysql struct {
GatherBinaryLogs bool GatherBinaryLogs bool
GatherTableIOWaits bool GatherTableIOWaits bool
GatherIndexIOWaits bool GatherIndexIOWaits bool
GatherTableSchema bool
} }
var sampleConfig = ` var sampleConfig = `
@ -44,6 +45,7 @@ var sampleConfig = `
GatherBinaryLogs = false GatherBinaryLogs = false
GatherTableIOWaits = false GatherTableIOWaits = false
GatherIndexIOWaits = false GatherIndexIOWaits = false
GatherTableSchema = false
` `
var defaultTimeout = time.Second * time.Duration(5) var defaultTimeout = time.Second * time.Duration(5)
@ -448,14 +450,11 @@ func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
return err return err
} }
if m.GatherTableSchema {
err = m.gatherTableSchema(db, serv, acc) err = m.gatherTableSchema(db, serv, acc)
if err != nil { if err != nil {
return err return err
} }
err = m.gatherTableSchema(db, serv, acc)
if err != nil {
return err
} }
return nil return nil
} }
@ -484,7 +483,7 @@ func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc telegraf.Accu
fields[key] = floatVal fields[key] = floatVal
} }
} }
acc.Add("mysql_variables", fields, tags) acc.AddFields("mysql_variables", fields, tags)
return nil return nil
} }