update go-monitoringplugin version and test-device-expectations

inexio · Nov 6, 2020 · 929366c · 929366c
1 parent 93446f4
commit 929366c
Show file tree

Hide file tree

Showing 8 changed files with 2,751 additions and 2,751 deletions.
diff --git a/core/request/check_interface_metrics_request_process.go b/core/request/check_interface_metrics_request_process.go
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/google/go-cmp v0.3.0
 	github.com/huandu/go-sqlbuilder v1.8.0
-	github.com/inexio/go-monitoringplugin v0.0.0-20201016110407-ff45fae4612b
+	github.com/inexio/go-monitoringplugin v0.0.0-20201106104905-c348723557ba
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/labstack/gommon v0.3.0 // indirect

diff --git a/go.sum b/go.sum
@@ -127,8 +127,8 @@ github.com/huandu/go-sqlbuilder v1.8.0 h1:1KP21dzROt03II0aoX/rD2Y6TX1VCIixSX5mvk
 github.com/huandu/go-sqlbuilder v1.8.0/go.mod h1:cM38aLPrMXaGxsUkHFh1e2skthPnQRPK7h8//X5LQMc=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inexio/go-monitoringplugin v0.0.0-20201016110407-ff45fae4612b h1:DLmmrQqNemmgF4sVkwq1XLJVlHQbrskdw4DNuN+exsQ=
-github.com/inexio/go-monitoringplugin v0.0.0-20201016110407-ff45fae4612b/go.mod h1:kzHRJGZ2iE/0IElB4NYI38h3h0HM5wqTTH7KyUCjkM8=
+github.com/inexio/go-monitoringplugin v0.0.0-20201106104905-c348723557ba h1:FJo6aIyoUUrjdHj2zzjQk+DZToZY0IeV6z7R5HHvs4Y=
+github.com/inexio/go-monitoringplugin v0.0.0-20201106104905-c348723557ba/go.mod h1:kzHRJGZ2iE/0IElB4NYI38h3h0HM5wqTTH7KyUCjkM8=
 github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -471,7 +471,7 @@ func metricsTransformer() cmp.Option {
 		out := make([]monitoringplugin.PerformanceDataPointInfo, len(in))
 		copy(out, in)
 		sort.Slice(out, func(i, j int) bool {
-			return out[i].LabelTag+out[i].Label < out[j].LabelTag+out[j].Label
+			return out[i].Label+out[i].Metric < out[j].Label+out[j].Metric
 		})
 		return out
 	})