chore: update prometheus depedency

Closes: #2532

There were significant reformatting changes in the prometheus service discovery
packages and their configuration, but it seems like the logic is mostly similar.

.circleci/config.yml

@@ -24,7 +24,7 @@ jobs:
       build:
             docker:
                   - image: nathanielc/docker-client
-            parallelism: 3
+            parallelism: 2
             working_directory: ~/kapacitor
             steps:
                   - checkout
@@ -57,4 +57,4 @@ workflows:
                               tags:
                                     only:  /^v[0-9]+(\.[0-9]+){2}(-(rc|beta)[0-9]+)?/
                               branches:
-                                    ignore:  /.*/
+                                    ignore:  /.*/

.gitignore

@@ -15,6 +15,7 @@ kapacitor*.zip
 *.test
 /test-logs
 *.prof
+/.idea/
 
 # Ignore any built binaries
 /kapacitor

cmd/kapacitord/run/command_test.go

@@ -55,7 +55,7 @@ func TestCommand_PIDFile(t *testing.T) {
 	}
 	go cmd.Close()
 
-	timeout := time.NewTimer(5 * time.Second)
+	timeout := time.NewTimer(1 * time.Minute)
 	select {
 	case <-timeout.C:
 		t.Fatal("unexpected timeout")

go.mod

@@ -3,112 +3,75 @@ module github.com/influxdata/kapacitor
 go 1.15
 
 require (
-	cloud.google.com/go v0.7.0 // indirect
-	github.com/Azure/azure-sdk-for-go v5.0.0-beta.0.20161028183111-bd73d950fa44+incompatible // indirect
-	github.com/Azure/go-autorest v7.3.1+incompatible // indirect
 	github.com/BurntSushi/toml v0.3.1
-	github.com/PuerkitoBio/purell v1.1.0 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170324140228-bbf7a2afc14f // indirect
-	github.com/armon/go-metrics v0.3.4 // indirect
-	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/aws/aws-sdk-go v1.8.16
+	github.com/armon/go-metrics v0.3.6 // indirect
+	github.com/aws/aws-sdk-go v1.38.3
 	github.com/benbjohnson/tmpl v1.0.0
-	github.com/blang/semver v3.5.0+incompatible // indirect
 	github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
-	github.com/cenkalti/backoff v1.0.0
-	github.com/coreos/go-oidc v0.0.0-20170307191026-be73733bb8cc // indirect
-	github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf // indirect
+	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/davecgh/go-spew v1.1.1
-	github.com/dgrijalva/jwt-go v3.0.0+incompatible
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dgryski/go-bits v0.0.0-20180113010104-bd8a69a71dc2 // indirect
 	github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8 // indirect
-	github.com/docker/distribution v2.6.1+incompatible // indirect
-	github.com/docker/docker v1.13.1
-	github.com/docker/go-connections v0.2.1 // indirect
-	github.com/docker/go-units v0.3.1 // indirect
+	github.com/docker/docker v20.10.5+incompatible
 	github.com/dustin/go-humanize v1.0.0
 	github.com/eclipse/paho.mqtt.golang v1.0.0
-	github.com/emicklei/go-restful v1.1.4-0.20151126145626-777bb3f19bca // indirect
-	github.com/evanphx/json-patch v0.0.0-20160803213441-30afec6a1650
+	github.com/evanphx/json-patch v4.9.0+incompatible
+	github.com/frankban/quicktest v1.11.0 // indirect
 	github.com/geoffgarside/ber v0.0.0-20170306085127-854377f11dfb // indirect
-	github.com/ghodss/yaml v0.0.0-20161207003320-04f313413ffd
-	github.com/go-ini/ini v1.27.0 // indirect
-	github.com/go-openapi/jsonpointer v0.0.0-20170102174223-779f45308c19 // indirect
-	github.com/go-openapi/jsonreference v0.0.0-20161105162150-36d33bfe519e // indirect
-	github.com/go-openapi/spec v0.0.0-20170413060731-e51c28f07047 // indirect
-	github.com/go-openapi/swag v0.0.0-20170424051500-24ebf76d720b // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/ghodss/yaml v1.0.0
 	github.com/golang/protobuf v1.4.3
-	github.com/google/go-cmp v0.5.4
-	github.com/google/uuid v1.0.0
-	github.com/googleapis/gax-go v0.0.0-20170321005343-9af46dd5a171 // indirect
+	github.com/google/go-cmp v0.5.5
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.1.2
+	github.com/gophercloud/gophercloud v0.17.0 // indirect
 	github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75
-	github.com/hashicorp/consul v0.8.1 // indirect
+	github.com/hashicorp/go-hclog v0.14.1 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.0 // indirect
 	github.com/hashicorp/go-msgpack v1.1.5 // indirect
-	github.com/hashicorp/go-multierror v1.0.0 // indirect
-	github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect
-	github.com/hashicorp/go-sockaddr v1.0.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/memberlist v0.1.0 // indirect
-	github.com/hashicorp/raft v1.2.0 // indirect
-	github.com/hashicorp/serf v0.8.1 // indirect
-	github.com/influxdata/influxdb v1.1.4
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/influxdata/influxdb v1.8.4
 	github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368
 	github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8
-	github.com/jmespath/go-jmespath v0.0.0-20151117175822-3433f3ea46d9 // indirect
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/juju/ratelimit v0.0.0-20170314011755-acf38b000a03 // indirect
 	github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef // indirect
 	github.com/k-sone/snmpgo v3.2.0+incompatible
 	github.com/kimor79/gollectd v1.0.0 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7
-	github.com/mattn/go-runewidth v0.0.2 // indirect
-	github.com/miekg/dns v0.0.0-20170412184748-6ebcb714d369 // indirect
-	github.com/mitchellh/copystructure v0.0.0-20170116004449-f81071c9d77b
-	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
-	github.com/mitchellh/mapstructure v0.0.0-20161204053518-5a0325d7fafa
-	github.com/mitchellh/reflectwalk v0.0.0-20170110165207-417edcfd99a4
+	github.com/mattn/go-runewidth v0.0.3 // indirect
+	github.com/mitchellh/copystructure v1.0.0
+	github.com/mitchellh/go-testing-interface v1.14.0 // indirect
+	github.com/mitchellh/mapstructure v1.4.1
+	github.com/mitchellh/reflectwalk v1.0.1
 	github.com/onsi/ginkgo v1.14.2 // indirect
 	github.com/onsi/gomega v1.10.3 // indirect
-	github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa // indirect
-	github.com/pkg/errors v0.8.1
-	github.com/prometheus/common v0.9.1
-	github.com/prometheus/prometheus v0.0.0-00010101000000-000000000000
+	github.com/pierrec/lz4 v2.5.2+incompatible // indirect
+	github.com/pkg/errors v0.9.1
+	github.com/prometheus/common v0.20.0
+	github.com/prometheus/prometheus v1.8.2-0.20210331101223-3cafc58827d1
 	github.com/rakyll/statik v0.1.7 // indirect
-	github.com/russross/blackfriday v0.0.0-20151110051855-0b647d0506a6 // indirect
-	github.com/samuel/go-zookeeper v0.0.0-20161028232340-1d7be4effb13 // indirect
-	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
+	github.com/russross/blackfriday v1.5.2 // indirect
 	github.com/segmentio/kafka-go v0.3.10
 	github.com/serenize/snaker v0.0.0-20161123064335-543781d2b79b
 	github.com/shurcooL/go v0.0.0-20170331015642-20b4b0a35211 // indirect
 	github.com/shurcooL/markdownfmt v0.0.0-20170214213350-10aae0a270ab
-	github.com/shurcooL/sanitized_anchor_name v0.0.0-20160918041101-1dba4b3954bc // indirect
-	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/spf13/pflag v0.0.0-20170418052314-2300d0f8576f // indirect
-	github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 // indirect
-	github.com/stretchr/testify v1.4.0
-	github.com/syndtr/goleveldb v0.0.0-20170409015612-8c81ea47d4c4 // indirect
-	github.com/ugorji/go v0.0.0-20170312112114-708a42d24682 // indirect
+	github.com/stretchr/testify v1.7.0
 	go.etcd.io/bbolt v1.3.5
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
-	golang.org/x/oauth2 v0.0.0-20170412232759-a6bd8cefa181 // indirect
-	golang.org/x/sys v0.0.0-20210305215415-5cdee2b1b5a0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/api v0.0.0-20170421051952-fbbaff182731 // indirect
-	google.golang.org/appengine v1.0.0 // indirect
-	google.golang.org/grpc v1.2.1 // indirect
-	google.golang.org/protobuf v1.23.0
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
+	google.golang.org/protobuf v1.25.0
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737
-	gopkg.in/inf.v0 v0.9.0 // indirect
-	k8s.io/client-go v1.5.1 // indirect
+	k8s.io/api v0.21.0 // indirect
+	k8s.io/apimachinery v0.21.0 // indirect
+	k8s.io/client-go v0.21.0 // indirect
 )
 
 replace gopkg.in/fsnotify.v1 => github.com/fsnotify/fsnotify v1.4.2
 
-replace github.com/prometheus/prometheus => github.com/goller/prometheus v1.6.1-0.20170502220046-58298e738211
+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