diff --git a/go.mod b/go.mod index 06002429859704f3a27abfe421cf670fd277f38c..a2d27519a43d2d11ca6bcd36f6a7349706ae2822 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/golang/protobuf v1.5.2 // indirect github.com/gwatts/gin-adapter v0.0.0-20170508204228-c44433c485ad + github.com/hashicorp/golang-lru v0.5.3 // indirect github.com/huandu/go-clone v1.3.0 github.com/kr/text v0.2.0 // indirect github.com/mattn/go-isatty v0.0.12 diff --git a/plugins/inputs/mysql/mysqld.go b/plugins/inputs/mysql/mysqld.go index 6c4da9930e18114898d569366b5f6bd5de0448fc..f8d6cc67c4f2a93cbde4b30b640a730dad5371da 100644 --- a/plugins/inputs/mysql/mysqld.go +++ b/plugins/inputs/mysql/mysqld.go @@ -148,7 +148,7 @@ func (m *MysqldExporter) Collect() ([]metric.Metric, error) { metricFamilies, err := m.registry.Gather() if err != nil { - return nil, errors.Wrap(err, "node exporter registry gather") + return nil, errors.Wrap(err, "mysql exporter registry gather") } for _, metricFamily := range metricFamilies { metricsFromMetricFamily := metric.ParseFromMetricFamily(metricFamily) diff --git a/plugins/inputs/mysql/table_input_test.go b/plugins/inputs/mysql/table_input_test.go index 150c50266ddbadae46490ec990fdd3098e7e68e2..1226e7960c590b2637ce86bfa12651f0daccb07e 100644 --- a/plugins/inputs/mysql/table_input_test.go +++ b/plugins/inputs/mysql/table_input_test.go @@ -130,7 +130,7 @@ func TestCollectConditionNotSatisfied(t *testing.T) { k1: 1 collectConfig: - sql: select t1, t2, m1, m2 from test_metric - condition: k0 + conditions: [k0] name: test tags: tag1: t1 @@ -161,7 +161,7 @@ func TestCollectConditionNotFound(t *testing.T) { k1: 1 collectConfig: - sql: select t1, t2, m1, m2 from test_metric - condition: k2 + conditions: [k2] name: test tags: tag1: t1 @@ -193,7 +193,7 @@ func TestCollectConditionNotBool(t *testing.T) { k2: x collectConfig: - sql: select t1, t2, m1, m2 from test_metric - condition: k2 + conditions: [k2] name: test tags: tag1: t1