diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c1b189df..0273a361e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,11 @@ 1. [#5810](https://github.com/influxdata/chronograf/pull/5810): Repair calculation of flux query range duration. 1. [#5815](https://github.com/influxdata/chronograf/pull/5815): Update time range of flux queries on dashboard zoom. + +### Other + +1. [#5816](https://github.com/influxdata/chronograf/pull/5816): Upgrade golang to 1.17.1. + ### Features 1. [#5807](https://github.com/influxdata/chronograf/pull/#5807): Distinguish template tasks in task list. diff --git a/Makefile b/Makefile index 19b6cfb44..235cbe679 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ dep: .jsdep .godep .godep: ifndef GOBINDATA @echo "Installing go-bindata" - go get -u github.com/kevinburke/go-bindata/go-bindata + go install github.com/kevinburke/go-bindata/...@v3.22.0+incompatible GO111MODULE=on go get endif @touch .godep diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build index 7eb619cd0..f6d0f99fa 100644 --- a/etc/Dockerfile_build +++ b/etc/Dockerfile_build @@ -36,7 +36,7 @@ ENV GOPATH /root/go ENV GO_VERSION 1.16.4 ENV GO_ARCH amd64 ENV GO111MODULES ON -RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \ +RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \ tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \ rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ENV PATH /usr/local/go/bin:$PATH diff --git a/go.mod b/go.mod index 7c04c9453..bf2a43e84 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/influxdata/chronograf -go 1.16 +go 1.17 require ( cloud.google.com/go/bigtable v1.10.0 // indirect @@ -32,6 +32,79 @@ require ( google.golang.org/api v0.46.0 ) +require ( + cloud.google.com/go v0.81.0 // indirect + github.com/apache/arrow/go/arrow v0.0.0-20200923215132-ac86123a3f01 // indirect + github.com/aymerick/douceur v0.2.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash v1.1.0 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/eclipse/paho.mqtt.golang v1.2.0 // indirect + github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/go-sql-driver/mysql v1.4.1 // indirect + github.com/gofrs/uuid v3.3.0+incompatible // indirect + github.com/golang/geo v0.0.0-20190916061304-5b978397cfec // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/flatbuffers v1.11.0 // indirect + github.com/google/go-querystring v1.0.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/gorilla/css v1.0.0 // indirect + github.com/gorilla/websocket v1.4.2 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.14.6 // indirect + github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e // indirect + github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9 // indirect + github.com/jonboulle/clockwork v0.2.2 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect + github.com/lib/pq v1.2.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.10.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.20.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/segmentio/kafka-go v0.3.10 // indirect + github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966 // indirect + github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect + go.etcd.io/etcd/api/v3 v3.5.0-alpha.0 // indirect + go.etcd.io/etcd/client/v2 v2.305.0-alpha.0 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 // indirect + go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 // indirect + go.opencensus.io v0.23.0 // indirect + go.uber.org/atomic v1.6.0 // indirect + go.uber.org/multierr v1.5.0 // indirect + go.uber.org/zap v1.16.0 // indirect + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect + golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect + golang.org/x/mod v0.4.1 // indirect + golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect + golang.org/x/tools v0.1.0 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210503173045-b96a97608f20 // indirect + google.golang.org/grpc v1.37.0 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) + replace github.com/coreos/go-systemd => github.com/coreos/go-systemd/v22 v22.0.0 replace github.com/prometheus/prometheus => github.com/goller/prometheus v1.6.1-0.20170502220046-58298e738211