remove use of consul_exporter fork (#362)

Upstream PR has been merged, we can use it directly now
grafana · Jan 27, 2021 · 175095d · 175095d
1 parent 96376c6
commit 175095d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/depcheck.yml b/.github/depcheck.yml
@@ -5,6 +5,7 @@ go_modules:
   - github.com/grafana/loki
   - github.com/justwatchcom/elasticsearch_exporter
   - github.com/oliver006/redis_exporter
+  - github.com/prometheus/consul_exporter 
   - github.com/prometheus/memcached_exporter
   - github.com/prometheus/statsd_exporter
   - github.com/weaveworks/common
@@ -22,4 +23,3 @@ github_repos:
   - github.com/prometheus/mysqld_exporter v0.12.1
   - github.com/prometheus/prometheus v2.21.0
   - github.com/wrouesnel/postgres_exporter v0.8.0
-  - github.com/prometheus/consul_exporter v0.7.1
diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.9.0
 	github.com/prometheus/common v0.15.0
-	github.com/prometheus/consul_exporter v0.0.0-00010101000000-000000000000
+	github.com/prometheus/consul_exporter v0.7.2-0.20210127095228-584c6de19f23
 	github.com/prometheus/memcached_exporter v0.8.0
 	github.com/prometheus/mysqld_exporter v0.0.0-00010101000000-000000000000
 	github.com/prometheus/node_exporter v1.0.1
@@ -65,7 +65,7 @@ replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0
 replace (
 	git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
 	github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
-  github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03
+	github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03
 	github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0
 )
 
@@ -77,7 +77,6 @@ replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20200521142311-984
 replace (
 	github.com/google/dnsmasq_exporter => github.com/grafana/dnsmasq_exporter v0.2.1-0.20201029182940-e5169b835a23
 	github.com/ncabatoff/process-exporter => github.com/grafana/process-exporter v0.7.3-0.20210106202358-831154072e2a
-	github.com/prometheus/consul_exporter => github.com/grafana/consul_exporter v0.7.2-0.20201202203923-5390bb9ecffc
 	github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.12.2-0.20201015182516-5ac885b2d38a
 	github.com/wrouesnel/postgres_exporter => github.com/grafana/postgres_exporter v0.8.1-0.20201106170118-5eedee00c1db
 )

diff --git a/go.sum b/go.sum
@@ -1771,6 +1771,8 @@ github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzk
 github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
+github.com/prometheus/consul_exporter v0.7.2-0.20210127095228-584c6de19f23 h1:uiqUXSekO5KtYy79evDl2Nuy6M2QXrYupqNQjUbhIwA=
+github.com/prometheus/consul_exporter v0.7.2-0.20210127095228-584c6de19f23/go.mod h1:OwZlAa0i3Erc/Rokn9HM3zk3KKfZGM/TeHscq/kdj5o=
 github.com/prometheus/memcached_exporter v0.7.0 h1:iqyuu+Up0rwb2M1efnXCCjttSEN7UZRssERfBaXUYlc=
 github.com/prometheus/memcached_exporter v0.7.1-0.20201204153924-4290508e6dcf h1:vQtiNHMX7VjIAoquNeb4oQueLxLUmXPfYMnYk+Q5ZIg=
 github.com/prometheus/memcached_exporter v0.7.1-0.20201204153924-4290508e6dcf/go.mod h1:YCz9i2SVVjyOpN8XJpPWnu6zqXO1qvlWg27qOuY0rd0=

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -526,7 +526,7 @@ github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
 github.com/prometheus/common/log
 github.com/prometheus/common/model
 github.com/prometheus/common/version
-# github.com/prometheus/consul_exporter v0.0.0-00010101000000-000000000000 => github.com/grafana/consul_exporter v0.7.2-0.20201202203923-5390bb9ecffc
+# github.com/prometheus/consul_exporter v0.7.2-0.20210127095228-584c6de19f23
 github.com/prometheus/consul_exporter/pkg/exporter
 # github.com/prometheus/memcached_exporter v0.8.0
 github.com/prometheus/memcached_exporter/pkg/exporter