Skip to content

Commit

Permalink
feat(influxql): newer influxql (#2689)
Browse files Browse the repository at this point in the history
  • Loading branch information
@docmerlin
docmerlin authored Jun 21, 2022
1 parent 83bf151 commit c05878b
Show file tree
Hide file tree
Showing 48 changed files with 355 additions and 312 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion batch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/gorhill/cronexpr"
"github.com/influxdata/influxdb/influxql"
"github.com/influxdata/influxql"
"github.com/influxdata/kapacitor/edge"
"github.com/influxdata/kapacitor/expvar"
"github.com/influxdata/kapacitor/influxdb"
Expand Down
7 changes: 4 additions & 3 deletions client/v1/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import (
"strconv"
"time"

"github.com/influxdata/influxdb/influxql"
"github.com/influxdata/influxdb/query"
"github.com/influxdata/influxql"
khttp "github.com/influxdata/kapacitor/http"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -1283,15 +1284,15 @@ func (c *Client) ListTasks(opt *ListTasksOptions) ([]Task, error) {
return r.Tasks, nil
}

func (c *Client) TaskOutput(link Link, name string) (*influxql.Result, error) {
func (c *Client) TaskOutput(link Link, name string) (*query.Result, error) {
u := *c.url
u.Path = path.Join(link.Href, name)

req, err := http.NewRequest("GET", u.String(), nil)
if err != nil {
return nil, err
}
r := &influxql.Result{}
r := &query.Result{}
_, err = c.Do(req, r, http.StatusOK)
if err != nil {
return nil, err
Expand Down
4 changes: 2 additions & 2 deletions client/v1/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/google/go-cmp/cmp"
"github.com/influxdata/influxdb/influxql"
"github.com/influxdata/influxdb/models"
"github.com/influxdata/influxdb/query"
"github.com/influxdata/kapacitor/client/v1"
)

Expand Down Expand Up @@ -1020,7 +1020,7 @@ func Test_TaskOutput(t *testing.T) {
if err != nil {
t.Fatal(err)
}
exp := &influxql.Result{
exp := &query.Result{
Series: models.Rows{{
Name: "cpu",
Columns: []string{"time", "value"},
Expand Down
2 changes: 1 addition & 1 deletion cmd/kapacitor/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

humanize "github.com/dustin/go-humanize"
"github.com/ghodss/yaml"
"github.com/influxdata/influxdb/influxql"
"github.com/influxdata/influxql"
"github.com/influxdata/kapacitor/client/v1"
"github.com/pkg/errors"
)
Expand Down
19 changes: 12 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ require (
github.com/influxdata/flux v0.151.1
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
github.com/influxdata/influx-cli/v2 v2.0.0-20210526124422-63da8eccbdb7
github.com/influxdata/influxdb v1.8.4
github.com/influxdata/influxdb v1.9.6
github.com/influxdata/influxdb/v2 v2.0.1-alpha.10.0.20210507184756-dc72dc3f0c07
github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256
github.com/influxdata/pkg-config v0.2.12
github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368
github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8
Expand Down Expand Up @@ -61,6 +62,7 @@ require (
cloud.google.com/go v0.82.0 // indirect
cloud.google.com/go/bigquery v1.8.0 // indirect
cloud.google.com/go/bigtable v1.10.1 // indirect
collectd.org v0.3.0 // indirect
github.com/AlecAivazis/survey/v2 v2.2.9 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v52.5.0+incompatible // indirect
Expand Down Expand Up @@ -96,13 +98,11 @@ require (
github.com/aws/smithy-go v1.3.1 // indirect
github.com/benbjohnson/immutable v0.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
github.com/bonitoo-io/go-sql-bigquery v0.3.4-1.4.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/deepmap/oapi-codegen v1.6.0 // indirect
github.com/denisenkom/go-mssqldb v0.10.0 // indirect
github.com/dgryski/go-bits v0.0.0-20180113010104-bd8a69a71dc2 // indirect
github.com/dimchansky/utfbom v1.1.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
Expand All @@ -114,6 +114,7 @@ require (
github.com/fatih/color v1.9.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/geoffgarside/ber v0.0.0-20170306085127-854377f11dfb // indirect
github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect
github.com/go-chi/chi v4.1.0+incompatible // indirect
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
Expand Down Expand Up @@ -150,6 +151,7 @@ require (
github.com/imdario/mergo v0.3.9 // indirect
github.com/influxdata/influxdb-client-go/v2 v2.3.1-0.20210518120617-5d1fff431040 // indirect
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6 // indirect
github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
Expand All @@ -162,9 +164,9 @@ require (
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/jsternberg/zap-logfmt v1.2.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/go-bindata v3.11.0+incompatible // indirect
github.com/kimor79/gollectd v1.0.0 // indirect
github.com/klauspost/compress v1.15.0 // indirect
github.com/lib/pq v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
Expand All @@ -180,18 +182,19 @@ require (
github.com/mna/pigeon v1.0.1-0.20180808201053-bb0192cfc2ae // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.3 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/philhofer/fwd v1.0.0 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pierrec/lz4/v4 v4.1.14 // indirect
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/rakyll/statik v0.1.7 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/segmentio/kafka-go v0.3.10 // indirect
Expand All @@ -201,11 +204,14 @@ require (
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/snowflakedb/gosnowflake v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tinylib/msgp v1.1.0 // indirect
github.com/uber-go/tally v3.3.17+incompatible // indirect
github.com/uber/athenadriver v1.1.13 // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/vertica/vertica-sql-go v1.1.1 // indirect
github.com/willf/bitset v1.1.9 // indirect
github.com/xdg/stringprep v1.0.0 // indirect
github.com/xlab/treeprint v1.0.0 // indirect
github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 // indirect
go.mongodb.org/mongo-driver v1.4.6 // indirect
go.opencensus.io v0.23.0 // indirect
Expand All @@ -215,6 +221,7 @@ require (
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
Expand Down Expand Up @@ -243,8 +250,6 @@ require (

replace gopkg.in/fsnotify.v1 => github.com/fsnotify/fsnotify v1.4.2

replace github.com/influxdata/influxdb => github.com/influxdata/influxdb v1.1.4

replace k8s.io/client-go => k8s.io/client-go v0.20.5

replace k8s.io/api => k8s.io/api v0.20.5
Expand Down
Loading

0 comments on commit c05878b

Please sign in to comment.