Merge pull request #21269 from gmarek/metrics-grabber

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-20 16:37:16 -08:00
commit 65b5d0cbf4
2 changed files with 13 additions and 15 deletions

View File

@ -30,7 +30,6 @@ KUBE_APISERVER_REQUEST_TIMEOUT=300
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}

View File

@ -23,20 +23,19 @@ import (
) )
var KnownSchedulerMetrics = map[string][]string{ var KnownSchedulerMetrics = map[string][]string{
"rest_client_request_latency_microseconds": {"url", "verb", "quantile"}, "rest_client_request_latency_microseconds": {"url", "verb", "quantile"},
"rest_client_request_latency_microseconds_count": {"url", "verb"}, "rest_client_request_latency_microseconds_count": {"url", "verb"},
"rest_client_request_latency_microseconds_sum": {"url", "verb"}, "rest_client_request_latency_microseconds_sum": {"url", "verb"},
"rest_client_request_status_codes": {"code", "host", "method"}, "rest_client_request_status_codes": {"code", "host", "method"},
"scheduler_binding_latency_microseconds": {"quantile"}, "scheduler_binding_latency_microseconds_bucket": {"le"},
"scheduler_binding_latency_microseconds_count": {}, "scheduler_binding_latency_microseconds_count": {},
"scheduler_binding_latency_microseconds_sum": {}, "scheduler_binding_latency_microseconds_sum": {},
"scheduler_binding_ratelimiter_saturation": {}, "scheduler_e2e_scheduling_latency_microseconds_bucket": {"le"},
"scheduler_e2e_scheduling_latency_microseconds": {"quantile"}, "scheduler_e2e_scheduling_latency_microseconds_count": {},
"scheduler_e2e_scheduling_latency_microseconds_count": {}, "scheduler_e2e_scheduling_latency_microseconds_sum": {},
"scheduler_e2e_scheduling_latency_microseconds_sum": {}, "scheduler_scheduling_algorithm_latency_microseconds_bucket": {"le"},
"scheduler_scheduling_algorithm_latency_microseconds": {"quantile"}, "scheduler_scheduling_algorithm_latency_microseconds_count": {},
"scheduler_scheduling_algorithm_latency_microseconds_count": {}, "scheduler_scheduling_algorithm_latency_microseconds_sum": {},
"scheduler_scheduling_algorithm_latency_microseconds_sum": {},
} }
type SchedulerMetrics Metrics type SchedulerMetrics Metrics