From f4a0a000ff085e45b542302b539ebab1f35bc3b4 Mon Sep 17 00:00:00 2001 From: rimadeodhar Date: Thu, 16 Sep 2021 10:22:03 -0700 Subject: [PATCH] vendor: Add dependency on prometheus Release note: None --- DEPS.bzl | 24 ++++++++++++++++++++++++ go.mod | 1 + go.sum | 7 +++++++ pkg/cmd/import-tools/main.go | 1 + vendor | 2 +- 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/DEPS.bzl b/DEPS.bzl index 7b4c50657b1d..3586a45ac347 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -36,6 +36,7 @@ def go_deps(): sum = "h1:UAqRo5xPCyTtZznAJ9iPVpDUFxGI0a6QWtQ8E+zwJRg=", version = "v0.0.0-20180905144921-8ca25c33eb11", ) + go_repository( name = "com_github_agnivade_levenshtein", build_file_proto_mode = "disable_global", @@ -181,6 +182,7 @@ def go_deps(): sum = "h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=", version = "v0.0.0-20160902184237-e75332964ef5", ) + go_repository( name = "com_github_asaskevich_govalidator", build_file_proto_mode = "disable_global", @@ -196,6 +198,7 @@ def go_deps(): sum = "h1:V489lmrdkIQSfF6OAGZZ1Cavcm7eczCm2JcGvX+yHRg=", version = "v1.38.69", ) + go_repository( name = "com_github_axiomhq_hyperloglog", build_file_proto_mode = "disable_global", @@ -1812,6 +1815,7 @@ def go_deps(): sum = "h1:f0n1xnMSmBLzVfsMMvriDyA75NB/oBgILX2GcHXIQzY=", version = "v0.0.0-20180427100037-88b0669f7d75", ) + go_repository( name = "com_github_gorilla_handlers", build_file_proto_mode = "disable_global", @@ -2090,6 +2094,7 @@ def go_deps(): sum = "h1:gvV6jG9dTgFEncxo+AF7PH6MZXi/vZl25owA/8Dg8Wo=", version = "v1.3.0", ) + go_repository( name = "com_github_hydrogen18_memlistener", build_file_proto_mode = "disable_global", @@ -2134,6 +2139,7 @@ def go_deps(): sum = "h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=", version = "v1.0.0", ) + go_repository( name = "com_github_iris_contrib_blackfriday", build_file_proto_mode = "disable_global", @@ -2672,6 +2678,7 @@ def go_deps(): sum = "h1:MNApn+Z+fIT4NPZopPfCc1obT6aY3SVM6DOctz1A9ZU=", version = "v0.0.0-20190426140909-c40012f20018", ) + go_repository( name = "com_github_magiconair_properties", build_file_proto_mode = "disable_global", @@ -3085,6 +3092,7 @@ def go_deps(): sum = "h1:6lF/f1/NN6kzUDBz6pyvQDEXO39jqXcWRLu/tKjtOUQ=", version = "v1.8.1", ) + go_repository( name = "com_github_nats_io_nkeys", build_file_proto_mode = "disable_global", @@ -3166,6 +3174,7 @@ def go_deps(): sum = "h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=", version = "v0.0.0-20170623195520-56545f4a5d46", ) + go_repository( name = "com_github_oklog_run", build_file_proto_mode = "disable_global", @@ -3220,6 +3229,7 @@ def go_deps(): sum = "h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA=", version = "v1.10.3", ) + go_repository( name = "com_github_opencontainers_go_digest", build_file_proto_mode = "disable_global", @@ -3249,6 +3259,7 @@ def go_deps(): sum = "h1:cVQhwfBgiKTMAdYPbVeuIiTkdY59qZ3sp5RpyO8CNtg=", version = "v0.0.0-20180911144301-b446539ab1e7", ) + go_repository( name = "com_github_opentracing_contrib_go_grpc", build_file_proto_mode = "disable_global", @@ -3301,6 +3312,7 @@ def go_deps(): sum = "h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=", version = "v0.0.0-20190530202638-03653db5a59c", ) + go_repository( name = "com_github_pascaldekloe_goe", build_file_proto_mode = "disable_global", @@ -3330,6 +3342,7 @@ def go_deps(): sum = "h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM=", version = "v1.8.1", ) + go_repository( name = "com_github_peterbourgon_diskv", build_file_proto_mode = "disable_global", @@ -3488,6 +3501,14 @@ def go_deps(): sum = "h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=", version = "v0.6.0", ) + go_repository( + name = "com_github_prometheus_prometheus", + build_file_proto_mode = "disable_global", + importpath = "github.com/prometheus/prometheus", + sum = "h1:7QPitgO2kOFG8ecuRn9O/4L9+10He72rVRJvMXrE9Hg=", + version = "v2.5.0+incompatible", + ) + go_repository( name = "com_github_prometheus_tsdb", build_file_proto_mode = "disable_global", @@ -3747,6 +3768,7 @@ def go_deps(): sum = "h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=", version = "v0.1.4", ) + go_repository( name = "com_github_spaolacci_murmur3", build_file_proto_mode = "disable_global", @@ -3804,6 +3826,7 @@ def go_deps(): sum = "h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=", version = "v0.0.0-20190523213315-cbe66965904d", ) + go_repository( name = "com_github_streadway_quantile", build_file_proto_mode = "disable_global", @@ -4117,6 +4140,7 @@ def go_deps(): sum = "h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=", version = "v0.0.0-20180802001716-5cc68e5049a0", ) + go_repository( name = "com_github_yudai_gojsondiff", build_file_proto_mode = "disable_global", diff --git a/go.mod b/go.mod index 507b4c898c79..e5879f88fc46 100644 --- a/go.mod +++ b/go.mod @@ -138,6 +138,7 @@ require ( github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a github.com/prometheus/common v0.10.0 github.com/prometheus/procfs v0.6.0 // indirect + github.com/prometheus/prometheus v2.5.0+incompatible github.com/pseudomuto/protoc-gen-doc v1.3.2 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/russross/blackfriday v1.6.0 // indirect diff --git a/go.sum b/go.sum index 8d3f39963f03..c34eedaa8f30 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,7 @@ github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= +github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= @@ -438,6 +439,7 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -1140,6 +1142,7 @@ github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= +github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olivere/elastic v6.2.27+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1261,6 +1264,9 @@ github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+G github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/prometheus v2.5.0+incompatible h1:7QPitgO2kOFG8ecuRn9O/4L9+10He72rVRJvMXrE9Hg= +github.com/prometheus/prometheus v2.5.0+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s= +github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/pseudomuto/protoc-gen-doc v1.3.2 h1:61vWZuxYa8D7Rn4h+2dgoTNqnluBmJya2MgbqO32z6g= github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= @@ -1324,6 +1330,7 @@ github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:X github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= diff --git a/pkg/cmd/import-tools/main.go b/pkg/cmd/import-tools/main.go index cfeb4cde6c43..4a99c58ff1de 100644 --- a/pkg/cmd/import-tools/main.go +++ b/pkg/cmd/import-tools/main.go @@ -34,6 +34,7 @@ import ( _ "github.com/mattn/goveralls" _ "github.com/mibk/dupl" _ "github.com/mmatczuk/go_generics/cmd/go_generics" + _ "github.com/prometheus/prometheus/promql" _ "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc" _ "github.com/wadey/gocovmerge" _ "golang.org/x/lint/golint" diff --git a/vendor b/vendor index 8b17a583b87d..d3a6df5ee942 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 8b17a583b87d588f57d114823b0c7aa5aeb20ceb +Subproject commit d3a6df5ee942c9014c859a9ea6d7fd45d96b238e