Skip to content

K
k3s
Commit 56f53b92 authored by David Ashpole's avatar David Ashpole
Browse files
Options

update prometheus dependency for staging

parent 066d61ce
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 39 deletions
staging/src/k8s.io/apiserver/Godeps/Godeps.json
View file @ 56f53b92
...@@ -520,7 +520,7 @@ ...@@ -520,7 +520,7 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Rev": "e51041b3fa41cece0dca035740ba6411905be473" "Rev": "e7e903064f5e9eb5da98208bae10b475d4db0f8c"
}, },
{ {
"ImportPath": "github.com/prometheus/client_model/go", "ImportPath": "github.com/prometheus/client_model/go",
...@@ -528,15 +528,23 @@ ...@@ -528,15 +528,23 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
},
{
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/procfs", "ImportPath": "github.com/prometheus/procfs",
"Rev": "454a56f35412459b5e684fd5ec0f9211b94f002a" "Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
},
{
"ImportPath": "github.com/prometheus/procfs/xfs",
"Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
}, },
{ {
"ImportPath": "github.com/spf13/pflag", "ImportPath": "github.com/spf13/pflag",
......
staging/src/k8s.io/apiserver/pkg/storage/etcd/metrics/metrics.go
View file @ 56f53b92
...@@ -24,26 +24,23 @@ import ( ...@@ -24,26 +24,23 @@ import (
) )
var ( var (
cacheHitCounter = prometheus.NewCounter( cacheHitCounterOpts = prometheus.CounterOpts{
prometheus.CounterOpts{ Name: "etcd_helper_cache_hit_count",
Name: "etcd_helper_cache_hit_count", Help: "Counter of etcd helper cache hits.",
Help: "Counter of etcd helper cache hits.", }
}, cacheHitCounter = prometheus.NewCounter(cacheHitCounterOpts)
) cacheMissCounterOpts = prometheus.CounterOpts{
cacheMissCounter = prometheus.NewCounter( Name: "etcd_helper_cache_miss_count",
prometheus.CounterOpts{ Help: "Counter of etcd helper cache miss.",
Name: "etcd_helper_cache_miss_count", }
Help: "Counter of etcd helper cache miss.", cacheMissCounter = prometheus.NewCounter(cacheMissCounterOpts)
}, cacheEntryCounterOpts = prometheus.CounterOpts{
) Name: "etcd_helper_cache_entry_count",
cacheEntryCounter = prometheus.NewCounter( Help: "Counter of etcd helper cache entries. This can be different from etcd_helper_cache_miss_count " +
prometheus.CounterOpts{ "because two concurrent threads can miss the cache and generate the same entry twice.",
Name: "etcd_helper_cache_entry_count", }
Help: "Counter of etcd helper cache entries. This can be different from etcd_helper_cache_miss_count " + cacheEntryCounter = prometheus.NewCounter(cacheEntryCounterOpts)
"because two concurrent threads can miss the cache and generate the same entry twice.", cacheGetLatency = prometheus.NewSummary(
},
)
cacheGetLatency = prometheus.NewSummary(
prometheus.SummaryOpts{ prometheus.SummaryOpts{
Name: "etcd_request_cache_get_latencies_summary", Name: "etcd_request_cache_get_latencies_summary",
Help: "Latency in microseconds of getting an object from etcd cache", Help: "Latency in microseconds of getting an object from etcd cache",
...@@ -104,9 +101,9 @@ func ObserveNewEntry() { ...@@ -104,9 +101,9 @@ func ObserveNewEntry() {
} }
func Reset() { func Reset() {
cacheHitCounter.Set(0) cacheHitCounter = prometheus.NewCounter(cacheHitCounterOpts)
cacheMissCounter.Set(0) cacheMissCounter = prometheus.NewCounter(cacheMissCounterOpts)
cacheEntryCounter.Set(0) cacheEntryCounter = prometheus.NewCounter(cacheEntryCounterOpts)
// TODO: Reset cacheAddLatency. // TODO: Reset cacheAddLatency.
// TODO: Reset cacheGetLatency. // TODO: Reset cacheGetLatency.
etcdRequestLatenciesSummary.Reset() etcdRequestLatenciesSummary.Reset()
......
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
View file @ 56f53b92
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Rev": "e51041b3fa41cece0dca035740ba6411905be473" "Rev": "e7e903064f5e9eb5da98208bae10b475d4db0f8c"
}, },
{ {
"ImportPath": "github.com/prometheus/client_model/go", "ImportPath": "github.com/prometheus/client_model/go",
...@@ -276,15 +276,23 @@ ...@@ -276,15 +276,23 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
},
{
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/procfs", "ImportPath": "github.com/prometheus/procfs",
"Rev": "454a56f35412459b5e684fd5ec0f9211b94f002a" "Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
},
{
"ImportPath": "github.com/prometheus/procfs/xfs",
"Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
}, },
{ {
"ImportPath": "github.com/spf13/cobra", "ImportPath": "github.com/spf13/cobra",
......
staging/src/k8s.io/kube-apiextensions-server/Godeps/Godeps.json
View file @ 56f53b92
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Rev": "e51041b3fa41cece0dca035740ba6411905be473" "Rev": "e7e903064f5e9eb5da98208bae10b475d4db0f8c"
}, },
{ {
"ImportPath": "github.com/prometheus/client_model/go", "ImportPath": "github.com/prometheus/client_model/go",
...@@ -268,15 +268,23 @@ ...@@ -268,15 +268,23 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
},
{
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/procfs", "ImportPath": "github.com/prometheus/procfs",
"Rev": "454a56f35412459b5e684fd5ec0f9211b94f002a" "Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
},
{
"ImportPath": "github.com/prometheus/procfs/xfs",
"Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
}, },
{ {
"ImportPath": "github.com/spf13/cobra", "ImportPath": "github.com/spf13/cobra",
......
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
View file @ 56f53b92
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang/prometheus", "ImportPath": "github.com/prometheus/client_golang/prometheus",
"Rev": "e51041b3fa41cece0dca035740ba6411905be473" "Rev": "e7e903064f5e9eb5da98208bae10b475d4db0f8c"
}, },
{ {
"ImportPath": "github.com/prometheus/client_model/go", "ImportPath": "github.com/prometheus/client_model/go",
...@@ -264,15 +264,23 @@ ...@@ -264,15 +264,23 @@
}, },
{ {
"ImportPath": "github.com/prometheus/common/expfmt", "ImportPath": "github.com/prometheus/common/expfmt",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
},
{
"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
"Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/common/model", "ImportPath": "github.com/prometheus/common/model",
"Rev": "ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650" "Rev": "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
}, },
{ {
"ImportPath": "github.com/prometheus/procfs", "ImportPath": "github.com/prometheus/procfs",
"Rev": "454a56f35412459b5e684fd5ec0f9211b94f002a" "Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
},
{
"ImportPath": "github.com/prometheus/procfs/xfs",
"Rev": "65c1f6f8f0fc1e2185eb9863a3bc751496404259"
}, },
{ {
"ImportPath": "github.com/spf13/cobra", "ImportPath": "github.com/spf13/cobra",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment