Skip to content

Commit 679f866

Browse files
replaced deprecated scheduler_binding_duration_seconds_bucket metric (#1140)
1 parent 72284a4 commit 679f866

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

dashboards/scheduler.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ local var = g.dashboard.variable;
8989
prometheus.new('${datasource}', 'sum(rate(scheduler_scheduling_attempt_duration_seconds_count{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s, instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance)' % $._config)
9090
+ prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} e2e' % $._config),
9191

92-
prometheus.new('${datasource}', 'sum(rate(scheduler_binding_duration_seconds_count{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s, instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance)' % $._config)
92+
prometheus.new('${datasource}', 'sum(rate(scheduler_pod_scheduling_sli_duration_seconds_count{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s, instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance)' % $._config)
9393
+ prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} binding' % $._config),
9494

9595
prometheus.new('${datasource}', 'sum(rate(scheduler_scheduling_algorithm_duration_seconds_count{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s, instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance)' % $._config)
@@ -106,7 +106,7 @@ local var = g.dashboard.variable;
106106
prometheus.new('${datasource}', 'histogram_quantile(0.99, sum(rate(scheduler_scheduling_attempt_duration_seconds_bucket{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s,instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance, le))' % $._config)
107107
+ prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} e2e' % $._config),
108108

109-
prometheus.new('${datasource}', 'histogram_quantile(0.99, sum(rate(scheduler_binding_duration_seconds_bucket{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s,instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance, le))' % $._config)
109+
prometheus.new('${datasource}', 'histogram_quantile(0.99, sum(rate(scheduler_pod_scheduling_sli_duration_seconds_bucket{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s,instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance, le))' % $._config)
110110
+ prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} binding' % $._config),
111111

112112
prometheus.new('${datasource}', 'histogram_quantile(0.99, sum(rate(scheduler_scheduling_algorithm_duration_seconds_bucket{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s,instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance, le))' % $._config)

rules/kube_scheduler.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
for metric in [
2323
'scheduler_scheduling_attempt_duration_seconds',
2424
'scheduler_scheduling_algorithm_duration_seconds',
25-
'scheduler_binding_duration_seconds',
25+
'scheduler_pod_scheduling_sli_duration_seconds',
2626
]
2727
],
2828
},

tests/kube_scheduler-test.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,44 +88,44 @@ tests:
8888
- value: 0.99
8989
labels: 'cluster_quantile:scheduler_scheduling_algorithm_duration_seconds:histogram_quantile{job="kube-scheduler",quantile="0.99"}'
9090

91-
# Test scheduler_binding_duration_seconds quantile 0.5
91+
# Test scheduler_pod_scheduling_sli_duration_seconds quantile 0.5
9292
- interval: 1m
9393
input_series:
94-
- series: 'scheduler_binding_duration_seconds_bucket{job="kube-scheduler",le="+Inf"}'
94+
- series: 'scheduler_pod_scheduling_sli_duration_seconds_bucket{job="kube-scheduler",le="+Inf"}'
9595
values: '0+60x5'
96-
- series: 'scheduler_binding_duration_seconds_bucket{job="kube-scheduler",le="1"}'
96+
- series: 'scheduler_pod_scheduling_sli_duration_seconds_bucket{job="kube-scheduler",le="1"}'
9797
values: '0+60x5'
9898
promql_expr_test:
9999
- eval_time: 5m
100-
expr: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile{quantile="0.5"}
100+
expr: cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile{quantile="0.5"}
101101
exp_samples:
102102
- value: 0.5
103-
labels: 'cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile{job="kube-scheduler",quantile="0.5"}'
103+
labels: 'cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile{job="kube-scheduler",quantile="0.5"}'
104104

105-
# Test scheduler_binding_duration_seconds quantile 0.9
105+
# Test scheduler_pod_scheduling_sli_duration_seconds quantile 0.9
106106
- interval: 1m
107107
input_series:
108-
- series: 'scheduler_binding_duration_seconds_bucket{job="kube-scheduler",le="+Inf"}'
108+
- series: 'scheduler_pod_scheduling_sli_duration_seconds_bucket{job="kube-scheduler",le="+Inf"}'
109109
values: '0+60x5'
110-
- series: 'scheduler_binding_duration_seconds_bucket{job="kube-scheduler",le="1"}'
110+
- series: 'scheduler_pod_scheduling_sli_duration_seconds_bucket{job="kube-scheduler",le="1"}'
111111
values: '0+60x5'
112112
promql_expr_test:
113113
- eval_time: 5m
114-
expr: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile{quantile="0.9"}
114+
expr: cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile{quantile="0.9"}
115115
exp_samples:
116116
- value: 0.9
117-
labels: 'cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile{job="kube-scheduler",quantile="0.9"}'
117+
labels: 'cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile{job="kube-scheduler",quantile="0.9"}'
118118

119-
# Test scheduler_binding_duration_seconds quantile 0.99
119+
# Test scheduler_pod_scheduling_sli_duration_seconds quantile 0.99
120120
- interval: 1m
121121
input_series:
122-
- series: 'scheduler_binding_duration_seconds_bucket{job="kube-scheduler",le="+Inf"}'
122+
- series: 'scheduler_pod_scheduling_sli_duration_seconds_bucket{job="kube-scheduler",le="+Inf"}'
123123
values: '0+60x5'
124-
- series: 'scheduler_binding_duration_seconds_bucket{job="kube-scheduler",le="1"}'
124+
- series: 'scheduler_pod_scheduling_sli_duration_seconds_bucket{job="kube-scheduler",le="1"}'
125125
values: '0+60x5'
126126
promql_expr_test:
127127
- eval_time: 5m
128-
expr: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile{quantile="0.99"}
128+
expr: cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile{quantile="0.99"}
129129
exp_samples:
130130
- value: 0.99
131-
labels: 'cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile{job="kube-scheduler",quantile="0.99"}'
131+
labels: 'cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile{job="kube-scheduler",quantile="0.99"}'

0 commit comments

Comments
 (0)