Use mode consistently: replace cpumode in thread_cpu_seconds_total.

ncabatoff · Apr 13, 2019 · c3f6a04 · c3f6a04
1 parent 2825293
commit c3f6a04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/integration-tester/main.go b/cmd/integration-tester/main.go
@@ -157,14 +157,14 @@ func verify(results map[string][]result) bool {
 	}
 
 	for _, result := range results["thread_cpu_seconds_total"] {
-		if result.labels["cpumode"] == "system" {
+		if result.labels["mode"] == "system" {
 			switch tname := result.labels["threadname"]; tname {
 			case "sysbusy", "blocking":
 				assertGreaterOrEqual("thread_cpu_seconds_total system "+tname, result.value, 0.00001)
 			default:
 				assertGreaterOrEqual("thread_cpu_seconds_total system "+tname, result.value, 0)
 			}
-		} else if result.labels["cpumode"] == "user" {
+		} else if result.labels["mode"] == "user" {
 			switch tname := result.labels["threadname"]; tname {
 			case "userbusy":
 				assertGreaterOrEqual("thread_cpu_seconds_total user "+tname, result.value, 0.00001)

diff --git a/cmd/process-exporter/main.go b/cmd/process-exporter/main.go
@@ -178,7 +178,7 @@ var (
 	threadCpuSecsDesc = prometheus.NewDesc(
 		"namedprocess_namegroup_thread_cpu_seconds_total",
 		"Cpu user/system usage in seconds",
-		[]string{"groupname", "threadname", "cpumode"},
+		[]string{"groupname", "threadname", "mode"},
 		nil)
 
 	threadIoBytesDesc = prometheus.NewDesc(