From 512dce7d49c97caa4400fb1484a3be5174b6e6b8 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Wed, 13 Apr 2016 23:17:22 +0200 Subject: [PATCH] Fix minor golint issues. --- collector/binlog.go | 1 + collector/engine_tokudb.go | 3 ++- collector/global_status.go | 3 ++- collector/global_variables.go | 3 ++- collector/slave_status.go | 3 ++- mysqld_exporter.go | 28 ++++++++++++++-------------- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/collector/binlog.go b/collector/binlog.go index cf74d3c..e8703eb 100644 --- a/collector/binlog.go +++ b/collector/binlog.go @@ -30,6 +30,7 @@ var ( ) ) +// ScrapeBinlogSize colects from `SHOW BINARY LOGS`. func ScrapeBinlogSize(db *sql.DB, ch chan<- prometheus.Metric) error { var logBin uint8 err := db.QueryRow(logbinQuery).Scan(&logBin) diff --git a/collector/engine_tokudb.go b/collector/engine_tokudb.go index 93e442d..cdecadc 100644 --- a/collector/engine_tokudb.go +++ b/collector/engine_tokudb.go @@ -1,4 +1,4 @@ -// Scrape `SHOW ENGINE TOKUDB STATUS` +// Scrape `SHOW ENGINE TOKUDB STATUS`. package collector @@ -34,6 +34,7 @@ func sanitizeTokudbMetric(metricName string) string { return metricName } +// ScrapeEngineTokudbStatus scrapes from `SHOW ENGINE TOKUDB STATUS`. func ScrapeEngineTokudbStatus(db *sql.DB, ch chan<- prometheus.Metric) error { tokudbRows, err := db.Query(engineTokudbStatusQuery) if err != nil { diff --git a/collector/global_status.go b/collector/global_status.go index 9c6d727..d1e8d87 100644 --- a/collector/global_status.go +++ b/collector/global_status.go @@ -1,4 +1,4 @@ -// Scrape 'SHOW GLOBAL STATUS' +// Scrape `SHOW GLOBAL STATUS`. package collector @@ -58,6 +58,7 @@ var ( ) ) +// ScrapeGlobalStatus collects from `SHOW GLOBAL STATUS`. func ScrapeGlobalStatus(db *sql.DB, ch chan<- prometheus.Metric) error { globalStatusRows, err := db.Query(globalStatusQuery) if err != nil { diff --git a/collector/global_variables.go b/collector/global_variables.go index 96a980a..24d3b5d 100644 --- a/collector/global_variables.go +++ b/collector/global_variables.go @@ -1,4 +1,4 @@ -// Scrape `SHOW GLOBAL VARIABLES` +// Scrape `SHOW GLOBAL VARIABLES`. package collector @@ -16,6 +16,7 @@ const ( globalVariablesQuery = `SHOW GLOBAL VARIABLES` ) +// ScrapeGlobalVariables collects from `SHOW GLOBAL VARIABLES`. func ScrapeGlobalVariables(db *sql.DB, ch chan<- prometheus.Metric) error { globalVariablesRows, err := db.Query(globalVariablesQuery) if err != nil { diff --git a/collector/slave_status.go b/collector/slave_status.go index d316783..300acc1 100644 --- a/collector/slave_status.go +++ b/collector/slave_status.go @@ -1,4 +1,4 @@ -// Scrape `SHOW SLAVE STATUS` +// Scrape `SHOW SLAVE STATUS`. package collector @@ -19,6 +19,7 @@ const ( var slaveStatusQuerySuffixes = [3]string{" NONBLOCKING", " NOLOCK", ""} +// ScrapeSlaveStatus collects from `SHOW SLAVE STATUS`. func ScrapeSlaveStatus(db *sql.DB, ch chan<- prometheus.Metric) error { var ( slaveStatusRows *sql.Rows diff --git a/mysqld_exporter.go b/mysqld_exporter.go index 415c1a4..369615c 100644 --- a/mysqld_exporter.go +++ b/mysqld_exporter.go @@ -862,7 +862,7 @@ func scrapePerfEventsStatements(db *sql.DB, ch chan<- prometheus.Metric) error { defer perfSchemaEventsStatementsRows.Close() var ( - schemaName, digest, digest_text string + schemaName, digest, digestText string count, queryTime, errors, warnings uint64 rowsAffected, rowsSent, rowsExamined uint64 tmpTables, tmpDiskTables uint64 @@ -872,57 +872,57 @@ func scrapePerfEventsStatements(db *sql.DB, ch chan<- prometheus.Metric) error { for perfSchemaEventsStatementsRows.Next() { if err := perfSchemaEventsStatementsRows.Scan( - &schemaName, &digest, &digest_text, &count, &queryTime, &errors, &warnings, &rowsAffected, &rowsSent, &rowsExamined, &tmpTables, &tmpDiskTables, &sortMergePasses, &sortRows, &noIndexUsed, + &schemaName, &digest, &digestText, &count, &queryTime, &errors, &warnings, &rowsAffected, &rowsSent, &rowsExamined, &tmpTables, &tmpDiskTables, &sortMergePasses, &sortRows, &noIndexUsed, ); err != nil { return err } ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsDesc, prometheus.CounterValue, float64(count), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsTimeDesc, prometheus.CounterValue, float64(queryTime)/picoSeconds, - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsErrorsDesc, prometheus.CounterValue, float64(errors), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsWarningsDesc, prometheus.CounterValue, float64(warnings), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsRowsAffectedDesc, prometheus.CounterValue, float64(rowsAffected), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsRowsSentDesc, prometheus.CounterValue, float64(rowsSent), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsRowsExaminedDesc, prometheus.CounterValue, float64(rowsExamined), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsTmpTablesDesc, prometheus.CounterValue, float64(tmpTables), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsTmpDiskTablesDesc, prometheus.CounterValue, float64(tmpDiskTables), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsSortMergePassesDesc, prometheus.CounterValue, float64(sortMergePasses), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsSortRowsDesc, prometheus.CounterValue, float64(sortRows), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) ch <- prometheus.MustNewConstMetric( performanceSchemaEventsStatementsNoIndexUsedDesc, prometheus.CounterValue, float64(noIndexUsed), - schemaName, digest, digest_text, + schemaName, digest, digestText, ) } return nil