Merge branch 'master' into sk/refactor-pod-namespace

skl · web-flow · commit f0abe75b7751 · 2025-11-27T18:10:19.000Z
diff --git a/.pint.hcl b/.pint.hcl
@@ -0,0 +1,5 @@
+checks {
+  # promql/impossible can't deal with label_join or label_replace
+  # https://github.com/cloudflare/pint/issues/1631
+  disabled = ["promql/impossible"]
+}
diff --git a/dashboards/network-usage/cluster-total.libsonnet b/dashboards/network-usage/cluster-total.libsonnet
@@ -72,7 +72,7 @@ local var = g.dashboard.variable;
                 * on (%(clusterLabel)s,namespace,pod) group_left ()
                   topk by (%(clusterLabel)s,namespace,pod) (
                     1,
-                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                   )
               )
             ||| % $._config
@@ -90,7 +90,7 @@ local var = g.dashboard.variable;
                 * on (%(clusterLabel)s,namespace,pod) group_left ()
                   topk by (%(clusterLabel)s,namespace,pod) (
                     1,
-                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                   )
               )
             ||| % $._config
@@ -107,7 +107,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -120,7 +120,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -133,7 +133,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -146,7 +146,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -159,7 +159,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -172,7 +172,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -185,7 +185,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -198,7 +198,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -307,7 +307,7 @@ local var = g.dashboard.variable;
                 * on (%(clusterLabel)s,namespace,pod) group_left ()
                   topk by (%(clusterLabel)s,namespace,pod) (
                     1,
-                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                   )
               )
             ||| % $._config
@@ -325,7 +325,7 @@ local var = g.dashboard.variable;
                 * on (%(clusterLabel)s,namespace,pod) group_left ()
                   topk by (%(clusterLabel)s,namespace,pod) (
                     1,
-                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                   )
               )
             ||| % $._config
@@ -343,7 +343,7 @@ local var = g.dashboard.variable;
                 * on (%(clusterLabel)s,namespace,pod) group_left ()
                   topk by (%(clusterLabel)s,namespace,pod) (
                     1,
-                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                   )
               )
             ||| % $._config
@@ -361,7 +361,7 @@ local var = g.dashboard.variable;
                 * on (%(clusterLabel)s,namespace,pod) group_left ()
                   topk by (%(clusterLabel)s,namespace,pod) (
                     1,
-                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                    max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                   )
               )
             ||| % $._config
@@ -378,7 +378,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -394,7 +394,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -410,7 +410,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
@@ -426,7 +426,7 @@ local var = g.dashboard.variable;
               * on (%(clusterLabel)s,namespace,pod) group_left ()
                 topk by (%(clusterLabel)s,namespace,pod) (
                   1,
-                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})
+                  max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})
                 )
             )
           ||| % $._config)
diff --git a/dashboards/scheduler.libsonnet b/dashboards/scheduler.libsonnet
@@ -89,7 +89,7 @@ local var = g.dashboard.variable;
           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)
           + prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} e2e' % $._config),
 
-          prometheus.new('${datasource}', 'sum(rate(scheduler_binding_duration_seconds_count{%(clusterLabel)s="$cluster", %(kubeSchedulerSelector)s, instance=~"$instance"}[%(grafanaIntervalVar)s])) by (%(clusterLabel)s, instance)' % $._config)
+          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)
           + prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} binding' % $._config),
 
           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;
           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)
           + prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} e2e' % $._config),
 
-          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)
+          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)
           + prometheus.withLegendFormat('{{%(clusterLabel)s}} {{instance}} binding' % $._config),
 
           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)
diff --git a/rules/kube_scheduler.libsonnet b/rules/kube_scheduler.libsonnet
@@ -22,7 +22,7 @@
           for metric in [
             'scheduler_scheduling_attempt_duration_seconds',
             'scheduler_scheduling_algorithm_duration_seconds',
-            'scheduler_binding_duration_seconds',
+            'scheduler_pod_scheduling_sli_duration_seconds',
           ]
         ],
       },
diff --git a/scripts/go.mod b/scripts/go.mod
@@ -4,7 +4,7 @@ go 1.25.3
 
 require (
 	github.com/Kunde21/markdownfmt/v3 v3.1.0
-	github.com/cloudflare/pint v0.76.1
+	github.com/cloudflare/pint v0.77.1
 	github.com/errata-ai/vale/v3 v3.13.0
 	github.com/google/go-jsonnet v0.21.0
 	github.com/grafana/dashboard-linter v0.0.0-20231114210226-c458893a5731
@@ -16,7 +16,7 @@ require (
 	atomicgo.dev/cursor v0.2.0 // indirect
 	atomicgo.dev/keyboard v0.2.9 // indirect
 	atomicgo.dev/schedule v0.1.0 // indirect
-	cel.dev/expr v0.24.0 // indirect
+	cel.dev/expr v0.25.0 // indirect
 	cloud.google.com/go v0.120.0 // indirect
 	cloud.google.com/go/auth v0.16.5 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
@@ -119,7 +119,7 @@ require (
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/go-github/v75 v75.0.0 // indirect
+	github.com/google/go-github/v78 v78.0.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
@@ -203,7 +203,7 @@ require (
 	github.com/prometheus/alertmanager v0.28.1 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.1 // indirect
+	github.com/prometheus/common v0.67.2 // indirect
 	github.com/prometheus/exporter-toolkit v0.14.1 // indirect
 	github.com/prometheus/otlptranslator v1.0.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
@@ -227,7 +227,7 @@ require (
 	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/tomwright/dasel/v2 v2.8.1 // indirect
-	github.com/urfave/cli/v3 v3.5.0 // indirect
+	github.com/urfave/cli/v3 v3.6.0 // indirect
 	github.com/vultr/govultr/v2 v2.17.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -239,7 +239,7 @@ require (
 	github.com/zclconf/go-cty v1.17.0 // indirect
 	github.com/zeebo/errs v1.4.0 // indirect
 	github.com/zeitlinger/conflate v0.0.0-20230622100834-279724abda8c // indirect
-	gitlab.com/gitlab-org/api/client-go v0.157.0 // indirect
+	gitlab.com/gitlab-org/api/client-go v0.159.0 // indirect
 	go.mongodb.org/mongo-driver v1.17.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/component v1.42.0 // indirect
@@ -275,7 +275,7 @@ require (
 	golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
 	golang.org/x/mod v0.29.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
+	golang.org/x/oauth2 v0.33.0 // indirect
 	golang.org/x/sync v0.18.0 // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/term v0.37.0 // indirect
diff --git a/scripts/go.sum b/scripts/go.sum
diff --git a/tests/kube_scheduler-test.yaml b/tests/kube_scheduler-test.yaml

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ local var = g.dashboard.variable;`
`72`	`72`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`73`	`73`	`topk by (%(clusterLabel)s,namespace,pod) (`
`74`	`74`	`1,`
`75`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`75`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`76`	`76`	`)`
`77`	`77`	`)`
`78`	`78`	`\|\|\| % $._config`
`@@ -90,7 +90,7 @@ local var = g.dashboard.variable;`
`90`	`90`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`91`	`91`	`topk by (%(clusterLabel)s,namespace,pod) (`
`92`	`92`	`1,`
`93`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`93`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`94`	`94`	`)`
`95`	`95`	`)`
`96`	`96`	`\|\|\| % $._config`
`@@ -107,7 +107,7 @@ local var = g.dashboard.variable;`
`107`	`107`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`108`	`108`	`topk by (%(clusterLabel)s,namespace,pod) (`
`109`	`109`	`1,`
`110`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`110`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`111`	`111`	`)`
`112`	`112`	`)`
`113`	`113`	`\|\|\| % $._config)`
`@@ -120,7 +120,7 @@ local var = g.dashboard.variable;`
`120`	`120`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`121`	`121`	`topk by (%(clusterLabel)s,namespace,pod) (`
`122`	`122`	`1,`
`123`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`123`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`124`	`124`	`)`
`125`	`125`	`)`
`126`	`126`	`\|\|\| % $._config)`
`@@ -133,7 +133,7 @@ local var = g.dashboard.variable;`
`133`	`133`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`134`	`134`	`topk by (%(clusterLabel)s,namespace,pod) (`
`135`	`135`	`1,`
`136`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`136`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`137`	`137`	`)`
`138`	`138`	`)`
`139`	`139`	`\|\|\| % $._config)`
`@@ -146,7 +146,7 @@ local var = g.dashboard.variable;`
`146`	`146`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`147`	`147`	`topk by (%(clusterLabel)s,namespace,pod) (`
`148`	`148`	`1,`
`149`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`149`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`150`	`150`	`)`
`151`	`151`	`)`
`152`	`152`	`\|\|\| % $._config)`
`@@ -159,7 +159,7 @@ local var = g.dashboard.variable;`
`159`	`159`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`160`	`160`	`topk by (%(clusterLabel)s,namespace,pod) (`
`161`	`161`	`1,`
`162`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`162`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`163`	`163`	`)`
`164`	`164`	`)`
`165`	`165`	`\|\|\| % $._config)`
`@@ -172,7 +172,7 @@ local var = g.dashboard.variable;`
`172`	`172`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`173`	`173`	`topk by (%(clusterLabel)s,namespace,pod) (`
`174`	`174`	`1,`
`175`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`175`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`176`	`176`	`)`
`177`	`177`	`)`
`178`	`178`	`\|\|\| % $._config)`
`@@ -185,7 +185,7 @@ local var = g.dashboard.variable;`
`185`	`185`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`186`	`186`	`topk by (%(clusterLabel)s,namespace,pod) (`
`187`	`187`	`1,`
`188`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`188`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`189`	`189`	`)`
`190`	`190`	`)`
`191`	`191`	`\|\|\| % $._config)`
`@@ -198,7 +198,7 @@ local var = g.dashboard.variable;`
`198`	`198`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`199`	`199`	`topk by (%(clusterLabel)s,namespace,pod) (`
`200`	`200`	`1,`
`201`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`201`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`202`	`202`	`)`
`203`	`203`	`)`
`204`	`204`	`\|\|\| % $._config)`
`@@ -307,7 +307,7 @@ local var = g.dashboard.variable;`
`307`	`307`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`308`	`308`	`topk by (%(clusterLabel)s,namespace,pod) (`
`309`	`309`	`1,`
`310`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`310`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`311`	`311`	`)`
`312`	`312`	`)`
`313`	`313`	`\|\|\| % $._config`
`@@ -325,7 +325,7 @@ local var = g.dashboard.variable;`
`325`	`325`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`326`	`326`	`topk by (%(clusterLabel)s,namespace,pod) (`
`327`	`327`	`1,`
`328`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`328`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`329`	`329`	`)`
`330`	`330`	`)`
`331`	`331`	`\|\|\| % $._config`
`@@ -343,7 +343,7 @@ local var = g.dashboard.variable;`
`343`	`343`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`344`	`344`	`topk by (%(clusterLabel)s,namespace,pod) (`
`345`	`345`	`1,`
`346`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`346`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`347`	`347`	`)`
`348`	`348`	`)`
`349`	`349`	`\|\|\| % $._config`
`@@ -361,7 +361,7 @@ local var = g.dashboard.variable;`
`361`	`361`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`362`	`362`	`topk by (%(clusterLabel)s,namespace,pod) (`
`363`	`363`	`1,`
`364`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`364`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`365`	`365`	`)`
`366`	`366`	`)`
`367`	`367`	`\|\|\| % $._config`
`@@ -378,7 +378,7 @@ local var = g.dashboard.variable;`
`378`	`378`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`379`	`379`	`topk by (%(clusterLabel)s,namespace,pod) (`
`380`	`380`	`1,`
`381`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`381`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`382`	`382`	`)`
`383`	`383`	`)`
`384`	`384`	`\|\|\| % $._config)`
`@@ -394,7 +394,7 @@ local var = g.dashboard.variable;`
`394`	`394`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`395`	`395`	`topk by (%(clusterLabel)s,namespace,pod) (`
`396`	`396`	`1,`
`397`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`397`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`398`	`398`	`)`
`399`	`399`	`)`
`400`	`400`	`\|\|\| % $._config)`
`@@ -410,7 +410,7 @@ local var = g.dashboard.variable;`
`410`	`410`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`411`	`411`	`topk by (%(clusterLabel)s,namespace,pod) (`
`412`	`412`	`1,`
`413`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`413`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`414`	`414`	`)`
`415`	`415`	`)`
`416`	`416`	`\|\|\| % $._config)`
`@@ -426,7 +426,7 @@ local var = g.dashboard.variable;`
`426`	`426`	`* on (%(clusterLabel)s,namespace,pod) group_left ()`
`427`	`427`	`topk by (%(clusterLabel)s,namespace,pod) (`
`428`	`428`	`1,`
`429`		`- max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false"})`
	`429`	`+ max by (%(clusterLabel)s,namespace,pod) (kube_pod_info{host_network="false",%(clusterLabel)s="$cluster"})`
`430`	`430`	`)`
`431`	`431`	`)`
`432`	`432`	`\|\|\| % $._config)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`for metric in [`
`23`	`23`	`'scheduler_scheduling_attempt_duration_seconds',`
`24`	`24`	`'scheduler_scheduling_algorithm_duration_seconds',`
`25`		`- 'scheduler_binding_duration_seconds',`
	`25`	`+ 'scheduler_pod_scheduling_sli_duration_seconds',`
`26`	`26`	`]`
`27`	`27`	`],`
`28`	`28`	`},`