diff --git a/vendor/github.com/weaveworks/promrus/promrus.go b/vendor/github.com/weaveworks/promrus/promrus.go index 4c20ab8bf..2b435c1d4 100644 --- a/vendor/github.com/weaveworks/promrus/promrus.go +++ b/vendor/github.com/weaveworks/promrus/promrus.go @@ -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 { diff --git a/vendor/manifest b/vendor/manifest index ab156c7fe..a3318d43d 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -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 },