use recording rule metric for cluster cpu utilization

ravilr · ravilr · commit d6f710fe44ed · 2022-02-15T12:21:58.000-08:00
diff --git a/dashboards/resources/cluster.libsonnet b/dashboards/resources/cluster.libsonnet
@@ -140,7 +140,7 @@ local template = grafana.template;
          })
         .addPanel(
           g.panel('CPU Utilisation') +
-          g.statPanel('1 - sum(avg by (mode) (rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode=~"idle|iowait|steal", %(clusterLabel)s="$cluster"}[%(grafanaIntervalVar)s])))' % $._config)
+          g.statPanel('cluster:node_cpu:ratio{%(clusterLabel)s="$cluster"}' % $._config)
         )
         .addPanel(
           g.panel('CPU Requests Commitment') +
diff --git a/dashboards/resources/multi-cluster.libsonnet b/dashboards/resources/multi-cluster.libsonnet
@@ -22,7 +22,7 @@ local g = import 'github.com/grafana/jsonnet-libs/grafana-builder/grafana.libson
            })
           .addPanel(
             g.panel('CPU Utilisation') +
-            g.statPanel('1 - sum(avg by (mode) (rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode=~"idle|iowait|steal"}[%(grafanaIntervalVar)s])))' % $._config)
+            g.statPanel('cluster:node_cpu:ratio')
           )
           .addPanel(
             g.panel('CPU Requests Commitment') +

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ local template = grafana.template;`
`140`	`140`	`})`
`141`	`141`	`.addPanel(`
`142`	`142`	`g.panel('CPU Utilisation') +`
`143`		`- g.statPanel('1 - sum(avg by (mode) (rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode=~"idle\|iowait\|steal", %(clusterLabel)s="$cluster"}[%(grafanaIntervalVar)s])))' % $._config)`
	`143`	`+ g.statPanel('cluster:node_cpu:ratio{%(clusterLabel)s="$cluster"}' % $._config)`
`144`	`144`	`)`
`145`	`145`	`.addPanel(`
`146`	`146`	`g.panel('CPU Requests Commitment') +`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ local g = import 'github.com/grafana/jsonnet-libs/grafana-builder/grafana.libson`
`22`	`22`	`})`
`23`	`23`	`.addPanel(`
`24`	`24`	`g.panel('CPU Utilisation') +`
`25`		`- g.statPanel('1 - sum(avg by (mode) (rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode=~"idle\|iowait\|steal"}[%(grafanaIntervalVar)s])))' % $._config)`
	`25`	`+ g.statPanel('cluster:node_cpu:ratio')`
`26`	`26`	`)`
`27`	`27`	`.addPanel(`
`28`	`28`	`g.panel('CPU Requests Commitment') +`