From be3bf807496acdeb37933143dab0c9fb70d88c26 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Mon, 17 Aug 2020 08:32:26 +0200 Subject: [PATCH] InfluxDB: Upgrade to latest InfluxDB Go client (#27021) Signed-off-by: Arve Knudsen --- go.mod | 2 +- go.sum | 4 ++-- pkg/tsdb/influxdb/flux/builder.go | 2 +- pkg/tsdb/influxdb/flux/executor.go | 2 +- pkg/tsdb/influxdb/flux/executor_test.go | 4 ++-- pkg/tsdb/influxdb/flux/flux.go | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 816828500af..3fcfa11325d 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/hashicorp/go-plugin v1.2.2 github.com/hashicorp/go-version v1.1.0 github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec - github.com/influxdata/influxdb-client-go v0.0.0-20200814135139-d68836272a45 + github.com/influxdata/influxdb-client-go/v2 v2.0.1 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af github.com/jung-kurt/gofpdf v1.10.1 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect diff --git a/go.sum b/go.sum index 40d14ba6955..85facf8602b 100644 --- a/go.sum +++ b/go.sum @@ -238,8 +238,8 @@ github.com/igm/sockjs-go/v3 v3.0.0 h1:4wLoB9WCnQ8RI87cmqUH778ACDFVmRpkKRCWBeuc+W github.com/igm/sockjs-go/v3 v3.0.0/go.mod h1:UqchsOjeagIBFHvd+RZpLaVRbCwGilEC08EDHsD1jYE= github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec h1:CGkYB1Q7DSsH/ku+to+foV4agt2F2miquaLUgF6L178= github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= -github.com/influxdata/influxdb-client-go v0.0.0-20200814135139-d68836272a45 h1:UePjGzItJZeZ4a4375kxZ6pc7myUjuqlpegERMzVYmo= -github.com/influxdata/influxdb-client-go v0.0.0-20200814135139-d68836272a45/go.mod h1:S+oZsPivqbcP1S9ur+T+QqXvrYS3NCZeMQtBoH4D1dw= +github.com/influxdata/influxdb-client-go/v2 v2.0.1 h1:vRla3taM+zkziP1NUGfN6Y6zJ9ZSSMg0fs/JhCGyX1s= +github.com/influxdata/influxdb-client-go/v2 v2.0.1/go.mod h1:eyFPc0lhFnNSpyCDb0ZkrB3Hbtqvn1K1JZmjo2BXqeo= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= diff --git a/pkg/tsdb/influxdb/flux/builder.go b/pkg/tsdb/influxdb/flux/builder.go index 8222c2e5ed5..a49c9ffd5e4 100644 --- a/pkg/tsdb/influxdb/flux/builder.go +++ b/pkg/tsdb/influxdb/flux/builder.go @@ -5,7 +5,7 @@ import ( "time" "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/influxdata/influxdb-client-go/api/query" + "github.com/influxdata/influxdb-client-go/v2/api/query" ) // Copied from: (Apache 2 license) diff --git a/pkg/tsdb/influxdb/flux/executor.go b/pkg/tsdb/influxdb/flux/executor.go index 3d89bc1c3f7..581ea0ddfb7 100644 --- a/pkg/tsdb/influxdb/flux/executor.go +++ b/pkg/tsdb/influxdb/flux/executor.go @@ -6,7 +6,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/influxdata/influxdb-client-go/api" + "github.com/influxdata/influxdb-client-go/v2/api" ) // executeQuery runs a flux query using the QueryModel to interpolate the query and the runner to execute it. diff --git a/pkg/tsdb/influxdb/flux/executor_test.go b/pkg/tsdb/influxdb/flux/executor_test.go index 72b9913621f..ff2b20fd18d 100644 --- a/pkg/tsdb/influxdb/flux/executor_test.go +++ b/pkg/tsdb/influxdb/flux/executor_test.go @@ -16,8 +16,8 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/experimental" "github.com/xorcare/pointer" - influxdb2 "github.com/influxdata/influxdb-client-go" - "github.com/influxdata/influxdb-client-go/api" + influxdb2 "github.com/influxdata/influxdb-client-go/v2" + "github.com/influxdata/influxdb-client-go/v2/api" ) //-------------------------------------------------------------- diff --git a/pkg/tsdb/influxdb/flux/flux.go b/pkg/tsdb/influxdb/flux/flux.go index fce6fd271d7..bd9d353c90b 100644 --- a/pkg/tsdb/influxdb/flux/flux.go +++ b/pkg/tsdb/influxdb/flux/flux.go @@ -8,8 +8,8 @@ import ( "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/tsdb" - influxdb2 "github.com/influxdata/influxdb-client-go" - "github.com/influxdata/influxdb-client-go/api" + influxdb2 "github.com/influxdata/influxdb-client-go/v2" + "github.com/influxdata/influxdb-client-go/v2/api" ) var (