github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-15 03:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest weaveworks/common and weaveworks/promrus.

Browse Source 
```
$ gvt delete github.com/weaveworks/common
$ gvt fetch -revision 41542d6238573fc99d2fd89e8df6618586974c7e github.com/weaveworks/common
2017/10/10 XX:XX:XX Fetching: github.com/weaveworks/common
2017/10/10 XX:XX:XX · Skipping (existing): github.com/golang/protobuf/ptypes
2017/10/10 XX:XX:XX · Skipping (existing): golang.org/x/net/context
2017/10/10 XX:XX:XX · Skipping (existing): github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc
2017/10/10 XX:XX:XX · Skipping (existing): github.com/opentracing/opentracing-go
2017/10/10 XX:XX:XX · Skipping (existing): github.com/sirupsen/logrus
2017/10/10 XX:XX:XX · Skipping (existing): github.com/weaveworks/promrus
2017/10/10 XX:XX:XX · Skipping (existing): github.com/davecgh/go-spew/spew
2017/10/10 XX:XX:XX · Skipping (existing): github.com/pmezard/go-difflib/difflib
2017/10/10 XX:XX:XX · Skipping (existing): google.golang.org/grpc/status
2017/10/10 XX:XX:XX · Skipping (existing): google.golang.org/grpc/metadata
2017/10/10 XX:XX:XX · Skipping (existing): github.com/armon/go-socks5
2017/10/10 XX:XX:XX · Skipping (existing): google.golang.org/genproto/googleapis/rpc/status
2017/10/10 XX:XX:XX · Skipping (existing): github.com/mgutz/ansi
2017/10/10 XX:XX:XX · Skipping (existing): github.com/mwitkow/go-grpc-middleware
2017/10/10 XX:XX:XX · Skipping (existing): github.com/sercand/kuberesolver
2017/10/10 XX:XX:XX · Skipping (existing): github.com/golang/protobuf/ptypes/empty
2017/10/10 XX:XX:XX · Skipping (existing): golang.org/x/tools/cover
2017/10/10 XX:XX:XX · Skipping (existing): github.com/opentracing-contrib/go-stdlib/nethttp
2017/10/10 XX:XX:XX · Skipping (existing): github.com/aws/aws-sdk-go/aws
2017/10/10 XX:XX:XX · Skipping (existing): github.com/aws/aws-sdk-go/aws/credentials
2017/10/10 XX:XX:XX · Skipping (existing): github.com/prometheus/client_golang/prometheus
2017/10/10 XX:XX:XX · Skipping (existing): github.com/golang/protobuf/ptypes/any
2017/10/10 XX:XX:XX · Skipping (existing): github.com/weaveworks-experiments/loki/pkg/client
2017/10/10 XX:XX:XX · Skipping (existing): google.golang.org/grpc
2017/10/10 XX:XX:XX · Skipping (existing): github.com/gorilla/mux
2017/10/10 XX:XX:XX · Skipping (existing): github.com/golang/protobuf/proto
2017/10/10 XX:XX:XX · Skipping (existing): github.com/opentracing/opentracing-go/ext
$ gvt delete github.com/weaveworks/promrus
$ gvt fetch -tag v1.2.0 github.com/weaveworks/promrus
2017/10/10 XX:XX:XX Fetching: github.com/weaveworks/promrus
2017/10/10 XX:XX:XX · Skipping (existing): gopkg.in/alecthomas/kingpin.v2
2017/10/10 XX:XX:XX · Skipping (existing): golang.org/x/net/context
2017/10/10 XX:XX:XX · Skipping (existing): github.com/julienschmidt/httprouter
2017/10/10 XX:XX:XX · Skipping (existing): golang.org/x/net/context/ctxhttp
2017/10/10 XX:XX:XX · Skipping (existing): github.com/go-kit/kit/log
2017/10/10 XX:XX:XX · Skipping (existing): github.com/go-kit/kit/log/level
2017/10/10 XX:XX:XX · Skipping (existing): github.com/pkg/errors
2017/10/10 XX:XX:XX · Skipping (existing): github.com/stretchr/objx
2017/10/10 XX:XX:XX · Skipping (existing): gopkg.in/yaml.v2
$ rm -fr vendor/github.com/weaveworks/promrus/vendor/github.com/sirupsen
```
This commit is contained in:
Marc CARRE
2017-10-10 18:27:41 +01:00
parent f5b6937416
commit d8dc538705
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/github.com/weaveworks/promrus/promrus.go generated vendored
View File

@@ -22,8 +22,11 @@ func NewPrometheusHook() (*PrometheusHook, error) {
}, []string{"level"})
// Initialise counters for all supported levels:
for _, level := range supportedLevels {
counterVec.WithLabelValues(level.String()).Set(0)
counterVec.WithLabelValues(level.String())
}
// Try to unregister the counter vector, in case already registered for some reason,
// e.g. double initialisation/configuration done by mistake by the end-user.
prometheus.Unregister(counterVec)
// Try to register the counter vector:
err := prometheus.Register(counterVec)
if err != nil {

4
vendor/manifest vendored
View File

@@ -1330,7 +1330,7 @@
"importpath": "github.com/weaveworks/common",
"repository": "https://github.com/weaveworks/common",
"vcs": "git",
"revision": "15746cbb5831e70c58d520634b09393b7c3cfd56",
"revision": "41542d6238573fc99d2fd89e8df6618586974c7e",
"branch": "HEAD",
"notests": true
},
@@ -1362,7 +1362,7 @@
"importpath": "github.com/weaveworks/promrus",
"repository": "https://github.com/weaveworks/promrus",
"vcs": "git",
"revision": "0b17fa8b72895f7896cc65da81c3c945a66c8f82",
"revision": "0599d764e054d4e983bb120e30759179fafe3942",
"branch": "HEAD",
"notests": true
},