From 63dd014412bda9ad03484c4fb58c62504cdc6c9a Mon Sep 17 00:00:00 2001 From: gmarek Date: Mon, 15 Feb 2016 16:51:01 +0100 Subject: [PATCH] Update SchedulerMetrics --- cluster/gce/config-test.sh | 1 - pkg/metrics/scheduler_metrics.go | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index c85d949db4b..32acf97cbf3 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -30,7 +30,6 @@ KUBE_APISERVER_REQUEST_TIMEOUT=300 PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} - OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160127} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} diff --git a/pkg/metrics/scheduler_metrics.go b/pkg/metrics/scheduler_metrics.go index 0377732e8bd..831ce621784 100644 --- a/pkg/metrics/scheduler_metrics.go +++ b/pkg/metrics/scheduler_metrics.go @@ -23,20 +23,19 @@ import ( ) var KnownSchedulerMetrics = map[string][]string{ - "rest_client_request_latency_microseconds": {"url", "verb", "quantile"}, - "rest_client_request_latency_microseconds_count": {"url", "verb"}, - "rest_client_request_latency_microseconds_sum": {"url", "verb"}, - "rest_client_request_status_codes": {"code", "host", "method"}, - "scheduler_binding_latency_microseconds": {"quantile"}, - "scheduler_binding_latency_microseconds_count": {}, - "scheduler_binding_latency_microseconds_sum": {}, - "scheduler_binding_ratelimiter_saturation": {}, - "scheduler_e2e_scheduling_latency_microseconds": {"quantile"}, - "scheduler_e2e_scheduling_latency_microseconds_count": {}, - "scheduler_e2e_scheduling_latency_microseconds_sum": {}, - "scheduler_scheduling_algorithm_latency_microseconds": {"quantile"}, - "scheduler_scheduling_algorithm_latency_microseconds_count": {}, - "scheduler_scheduling_algorithm_latency_microseconds_sum": {}, + "rest_client_request_latency_microseconds": {"url", "verb", "quantile"}, + "rest_client_request_latency_microseconds_count": {"url", "verb"}, + "rest_client_request_latency_microseconds_sum": {"url", "verb"}, + "rest_client_request_status_codes": {"code", "host", "method"}, + "scheduler_binding_latency_microseconds_bucket": {"le"}, + "scheduler_binding_latency_microseconds_count": {}, + "scheduler_binding_latency_microseconds_sum": {}, + "scheduler_e2e_scheduling_latency_microseconds_bucket": {"le"}, + "scheduler_e2e_scheduling_latency_microseconds_count": {}, + "scheduler_e2e_scheduling_latency_microseconds_sum": {}, + "scheduler_scheduling_algorithm_latency_microseconds_bucket": {"le"}, + "scheduler_scheduling_algorithm_latency_microseconds_count": {}, + "scheduler_scheduling_algorithm_latency_microseconds_sum": {}, } type SchedulerMetrics Metrics