github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82745 from RainbowMango/pr_migrate_prom_bucket_for_stability

Browse Source 
Migrate prometheus bucket functionality for metrics stability framework
This commit is contained in:
Kubernetes Prow Robot 2019-09-16 20:28:37 -07:00 committed by GitHub
commit c7d84ac77e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/component-base/metrics/prometheus/restclient/BUILD
View File

@ -14,7 +14,6 @@ go_library(
"//staging/src/k8s.io/client-go/tools/metrics:go_default_library", "//staging/src/k8s.io/client-go/tools/metrics:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library",
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
], ],
) )

6
staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics.go
View File

@ -20,8 +20,6 @@ import (
"net/url" "net/url"
"time" "time"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/client-go/tools/metrics" "k8s.io/client-go/tools/metrics"
k8smetrics "k8s.io/component-base/metrics" k8smetrics "k8s.io/component-base/metrics"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
@ -34,7 +32,7 @@ var (
&k8smetrics.HistogramOpts{ &k8smetrics.HistogramOpts{
Name: "rest_client_request_duration_seconds", Name: "rest_client_request_duration_seconds",
Help: "Request latency in seconds. Broken down by verb and URL.", Help: "Request latency in seconds. Broken down by verb and URL.",
Buckets: prometheus.ExponentialBuckets(0.001, 2, 10), Buckets: k8smetrics.ExponentialBuckets(0.001, 2, 10),
}, },
[]string{"verb", "url"}, []string{"verb", "url"},
) )
@ -44,7 +42,7 @@ var (
&k8smetrics.HistogramOpts{ &k8smetrics.HistogramOpts{
Name: "rest_client_request_latency_seconds", Name: "rest_client_request_latency_seconds",
Help: "(Deprecated) Request latency in seconds. Broken down by verb and URL.", Help: "(Deprecated) Request latency in seconds. Broken down by verb and URL.",
Buckets: prometheus.ExponentialBuckets(0.001, 2, 10), Buckets: k8smetrics.ExponentialBuckets(0.001, 2, 10),
}, },
[]string{"verb", "url"}, []string{"verb", "url"},
) )

1
staging/src/k8s.io/component-base/metrics/prometheus/workqueue/BUILD
View File

@ -10,7 +10,6 @@ go_library(
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library", "//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library",
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
], ],
) )

6
staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go
View File

@ -17,8 +17,6 @@ limitations under the License.
package workqueue package workqueue
import ( import (
"github.com/prometheus/client_golang/prometheus"
"k8s.io/client-go/util/workqueue" "k8s.io/client-go/util/workqueue"
k8smetrics "k8s.io/component-base/metrics" k8smetrics "k8s.io/component-base/metrics"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
@ -56,14 +54,14 @@ var (
Subsystem: WorkQueueSubsystem, Subsystem: WorkQueueSubsystem,
Name: QueueLatencyKey, Name: QueueLatencyKey,
Help: "How long in seconds an item stays in workqueue before being requested.", Help: "How long in seconds an item stays in workqueue before being requested.",
Buckets: prometheus.ExponentialBuckets(10e-9, 10, 10), Buckets: k8smetrics.ExponentialBuckets(10e-9, 10, 10),
}, []string{"name"}) }, []string{"name"})
workDuration = k8smetrics.NewHistogramVec(&k8smetrics.HistogramOpts{ workDuration = k8smetrics.NewHistogramVec(&k8smetrics.HistogramOpts{
Subsystem: WorkQueueSubsystem, Subsystem: WorkQueueSubsystem,
Name: WorkDurationKey, Name: WorkDurationKey,
Help: "How long in seconds processing an item from workqueue takes.", Help: "How long in seconds processing an item from workqueue takes.",
Buckets: prometheus.ExponentialBuckets(10e-9, 10, 10), Buckets: k8smetrics.ExponentialBuckets(10e-9, 10, 10),
}, []string{"name"}) }, []string{"name"})
unfinished = k8smetrics.NewGaugeVec(&k8smetrics.GaugeOpts{ unfinished = k8smetrics.NewGaugeVec(&k8smetrics.GaugeOpts{