Merge pull request #50 from kitianFresh/bugfix/node-usage

fix node cpu usage

pkg/prediction/config/config.go

@@ -17,8 +17,9 @@ const (
 	// WorkloadMemUsagePromQLFmtStr is used to query workload mem usage by promql, param is namespace, workload-name
 	WorkloadMemUsagePromQLFmtStr = `sum(container_memory_working_set_bytes{container!="",image!="", name=~"^k8s_.*",container!="POD",namespace="%s",pod=~"^%s-.*$"})`
 
+	// following is node exporter and cadvisor metric for node cpu/memory usage
 	// NodeCpuUsagePromQLFmtStr is used to query node cpu usage by promql,  param is node name which prometheus scrape, duration str
-	NodeCpuUsagePromQLFmtStr = `1-avg(rate(node_cpu_seconds_total{mode="idle",instance=~"^%s.*"}[%s]))`
+	NodeCpuUsagePromQLFmtStr = `sum(machine_cpu_cores{instance=~"%s.*"}) - sum(irate(node_cpu_seconds_total{mode="idle",instance=~"%s.*"}[%s]))`
 	// NodeMemUsagePromQLFmtStr is used to query node cpu memory by promql,  param is node name, node name which prometheus scrape
 	NodeMemUsagePromQLFmtStr = `sum(node_memory_MemTotal_bytes{instance=~"^%s.*"} - node_memory_MemAvailable_bytes{instance=~"^%s.*"})`
 )
@@ -113,7 +114,7 @@ func (c *MetricContext) ResourceToPromQueryExpr(resourceName *corev1.ResourceNam
 	if strings.ToLower(c.TargetKind) == strings.ToLower(TargetKindNode) {
 		switch *resourceName {
 		case corev1.ResourceCPU:
-			return fmt.Sprintf(NodeCpuUsagePromQLFmtStr, c.Name, "1m")
+			return fmt.Sprintf(NodeCpuUsagePromQLFmtStr, c.Name, c.Name, "1m")
 		case corev1.ResourceMemory:
 			return fmt.Sprintf(NodeMemUsagePromQLFmtStr, c.Name, c.Name)
 		}