Merge pull request #230 from rfratto/use-exporter-toolkit

Replace node_exporter https package with exporter-toolkit

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
 defaults: &defaults
   docker:
-    - image: weaveworks/build-golang:1.13.3-stretch
+    - image: weaveworks/build-golang:1.14.4-stretch
   working_directory: /go/src/github.com/weaveworks/common
 
 workflows:

Makefile

@@ -6,7 +6,7 @@
 IMAGE_PREFIX := weaveworks
 IMAGE_TAG := $(shell ./tools/image-tag)
 UPTODATE := .uptodate
-BUILD_IMAGE=weaveworks/build-golang:1.13.3-stretch
+BUILD_IMAGE=weaveworks/build-golang:1.14.4-stretch
 
 # Building Docker images is now automated. The convention is every directory
 # with a Dockerfile in it builds an image called weaveworks/<dirname>.

go.mod

@@ -1,35 +1,39 @@
 module github.com/weaveworks/common
 
-go 1.13
+go 1.14
 
 require (
-	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/aws/aws-sdk-go v1.27.0
-	github.com/davecgh/go-spew v1.1.1
-	github.com/felixge/httpsnoop v1.0.1
-	github.com/go-kit/log v0.1.0
-	github.com/gogo/googleapis v1.1.0
-	github.com/gogo/protobuf v1.3.0
-	github.com/gogo/status v1.0.3
-	github.com/golang/protobuf v1.3.3
-	github.com/gorilla/mux v1.7.3
-	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
-	github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
-	github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
-	github.com/opentracing/opentracing-go v1.1.0
-	github.com/pkg/errors v0.9.1
-	github.com/pmezard/go-difflib v1.0.0
-	github.com/prometheus/client_golang v1.4.1
-	github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289
-	github.com/sercand/kuberesolver v2.1.0+incompatible
-	github.com/sirupsen/logrus v1.4.2
-	github.com/stretchr/testify v1.4.0
-	github.com/uber/jaeger-client-go v2.28.0+incompatible
-	github.com/uber/jaeger-lib v2.2.0+incompatible
-	github.com/weaveworks/promrus v1.2.0
-	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
-	golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2
-	google.golang.org/grpc v1.26.0
-	gopkg.in/yaml.v2 v2.2.8
+  github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
+  github.com/aws/aws-sdk-go v1.27.0
+  github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
+  github.com/davecgh/go-spew v1.1.1
+  github.com/felixge/httpsnoop v1.0.1
+  github.com/go-kit/log v0.1.0
+  github.com/gogo/googleapis v1.1.0
+  github.com/gogo/protobuf v1.3.0
+  github.com/gogo/status v1.0.3
+  github.com/golang/protobuf v1.4.3
+  github.com/gorilla/mux v1.7.3
+  github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
+  github.com/mattn/go-colorable v0.0.9 // indirect
+  github.com/mattn/go-isatty v0.0.4 // indirect
+  github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
+  github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
+  github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
+  github.com/opentracing/opentracing-go v1.1.0
+  github.com/pkg/errors v0.9.1
+  github.com/pmezard/go-difflib v1.0.0
+  github.com/prometheus/client_golang v1.11.0
+  github.com/prometheus/exporter-toolkit v0.7.0
+  github.com/sercand/kuberesolver v2.4.0+incompatible
+  github.com/sirupsen/logrus v1.6.0
+  github.com/stretchr/testify v1.4.0
+  github.com/uber/jaeger-client-go v2.28.0+incompatible
+  github.com/uber/jaeger-lib v2.2.0+incompatible
+  github.com/weaveworks/promrus v1.2.0
+  go.uber.org/atomic v1.5.1 // indirect
+  golang.org/x/net v0.0.0-20210525063256-abc453219eb5
+  golang.org/x/tools v0.0.0-20200825202427-b303f430e36d
+  google.golang.org/grpc v1.31.0
+  gopkg.in/yaml.v2 v2.4.0
 )