Add normalized CPU values and number of cores

metricbeat/docs/fields.asciidoc

@@ -9870,7 +9870,7 @@ System status metrics, like CPU and memory usage, that are collected from the op
 [float]
 == core Fields
 
-`system-core` contains local CPU core stats.
+`system-core` contains CPU metrics for a single core of a multi-core system.
 
 
 
@@ -9889,7 +9889,7 @@ type: scaled_float
 
 format: percent
 
-The percentage of CPU time spent in user space. On multi-core systems, you can have percentages that are greater than 100%. For example, if 3 cores are at 60% use, then the `cpu.user_p` will be 180%.
+The percentage of CPU time spent in user space.
 
 
 [float]
@@ -10038,7 +10038,7 @@ The amount of CPU time spent in involuntary wait by the virtual CPU while the hy
 
 type: long
 
-The number of CPU cores. The CPU percentages can range from `[0, 100% * cores]`.
+The number of CPU cores present on the host. The non-normalized percentages will have a maximum value of `100% * cores`. The normalized percentages already take this value into account and have a maximum value of 100%.
 
 
 [float]
@@ -10121,6 +10121,86 @@ format: percent
 The percentage of CPU time spent in involuntary wait by the virtual CPU while the hypervisor was servicing another processor. Available only on Unix.
 
 
+[float]
+=== system.cpu.user.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent in user space.
+
+
+[float]
+=== system.cpu.system.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent in kernel space.
+
+
+[float]
+=== system.cpu.nice.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent on low-priority processes.
+
+
+[float]
+=== system.cpu.idle.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent idle.
+
+
+[float]
+=== system.cpu.iowait.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent in wait (on disk).
+
+
+[float]
+=== system.cpu.irq.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent servicing and handling hardware interrupts.
+
+
+[float]
+=== system.cpu.softirq.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent servicing and handling software interrupts.
+
+
+[float]
+=== system.cpu.steal.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent in involuntary wait by the virtual CPU while the hypervisor was servicing another processor. Available only on Unix.
+
+
 [float]
 === system.cpu.user.ticks
 
@@ -10419,7 +10499,7 @@ Total space (used plus free).
 [float]
 == load Fields
 
-Load averages.
+CPU load averages.
 
 
 
@@ -10452,23 +10532,31 @@ Load average for the last 15 minutes.
 
 type: scaled_float
 
-Load divided by the number of cores for the last minute.
+Load for the last minute divided by the number of cores.
 
 
 [float]
 === system.load.norm.5
 
 type: scaled_float
 
-Load divided by the number of cores for the last 5 minutes.
+Load for the last 5 minutes divided by the number of cores.
 
 
 [float]
 === system.load.norm.15
 
 type: scaled_float
 
-Load divided by the number of cores for the last 15 minutes.
+Load for the last 15 minutes divided by the number of cores.
+
+
+[float]
+=== system.load.cores
+
+type: long
+
+The number of CPU cores present on the host.
 
 
 [float]
@@ -10789,6 +10877,16 @@ format: percent
 The percentage of CPU time spent by the process since the last update. Its value is similar to the %CPU value of the process displayed by the top command on Unix systems.
 
 
+[float]
+=== system.process.cpu.total.norm.pct
+
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent by the process since the last event. This value is normalized by the number of CPU cores and it ranges from 0 to 100%.
+
+
 [float]
 === system.process.cpu.system
 

metricbeat/mb/testing/modules.go

@@ -126,6 +126,25 @@ func NewEventsFetcher(t testing.TB, config interface{}) mb.EventsFetcher {
 	return fetcher
 }
 
+func NewReportingMetricSet(t testing.TB, config interface{}) mb.ReportingMetricSet {
+	metricSet := newMetricSet(t, config)
+
+	reportingMetricSet, ok := metricSet.(mb.ReportingMetricSet)
+	if !ok {
+		t.Fatal("MetricSet does not implement ReportingMetricSet")
+	}
+
+	return reportingMetricSet
+}
+
+// ReportingFetch runs the given reporting metricset and returns all of the
+// events and errors that occur during that period.
+func ReportingFetch(metricSet mb.ReportingMetricSet) ([]common.MapStr, []error) {
+	r := &capturingReporter{}
+	metricSet.Fetch(r)
+	return r.events, r.errs
+}
+
 // NewPushMetricSet instantiates a new PushMetricSet using the given
 // configuration. The ModuleFactory and MetricSetFactory are obtained from the
 // global Registry.

metricbeat/metricbeat.full.yml

@@ -47,8 +47,9 @@ metricbeat.modules:
   period: 10s
   processes: ['.*']
 
-  # if true, exports the CPU usage in ticks, together with the percentage values
-  #cpu_ticks: false
+  # Configure the metric types that are included by these metricsets.
+  cpu.metrics:  ["percentages"]  # The other available options are normalized_percentages and ticks.
+  core.metrics: ["percentages"]  # The other available option is ticks.
 
   # These options allow you to filter out all processes that are not
   # in the top N by CPU or memory, in order to reduce the number of documents created.

metricbeat/module/system/_meta/config.full.yml

@@ -15,8 +15,9 @@
   period: 10s
   processes: ['.*']
 
-  # if true, exports the CPU usage in ticks, together with the percentage values
-  #cpu_ticks: false
+  # Configure the metric types that are included by these metricsets.
+  cpu.metrics:  ["percentages"]  # The other available options are normalized_percentages and ticks.
+  core.metrics: ["percentages"]  # The other available option is ticks.
 
   # These options allow you to filter out all processes that are not
   # in the top N by CPU or memory, in order to reduce the number of documents created.

metricbeat/module/system/core/_meta/data.json

@@ -11,14 +11,14 @@
     },
     "system": {
         "core": {
-            "id": 0,
+            "id": 1,
             "idle": {
-                "pct": 0.9063,
-                "ticks": 22204290
+                "pct": 0.98,
+                "ticks": 243110733
             },
             "iowait": {
                 "pct": 0,
-                "ticks": 79386
+                "ticks": 0
             },
             "irq": {
                 "pct": 0,
@@ -30,21 +30,20 @@
             },
             "softirq": {
                 "pct": 0,
-                "ticks": 7944
+                "ticks": 0
             },
             "steal": {
                 "pct": 0,
                 "ticks": 0
             },
             "system": {
-                "pct": 0.0208,
-                "ticks": 160489
+                "pct": 0,
+                "ticks": 840906
             },
             "user": {
-                "pct": 0.0729,
-                "ticks": 417331
+                "pct": 0.02,
+                "ticks": 1266791
             }
         }
-    },
-    "type": "metricsets"
+    }
 }

metricbeat/module/system/core/_meta/fields.yml

@@ -1,19 +1,19 @@
 - name: core
   type: group
   description: >
-    `system-core` contains local CPU core stats.
+    `system-core` contains CPU metrics for a single core of a multi-core system.
   fields:
     - name: id
       type: long
       description: >
         CPU Core number.
 
+    # Percentages
     - name: user.pct
       type: scaled_float
       format: percent
       description: >
-        The percentage of CPU time spent in user space. On multi-core systems, you can have percentages that are greater than 100%.
-        For example, if 3 cores are at 60% use, then the `cpu.user_p` will be 180%.
+        The percentage of CPU time spent in user space.
 
     - name: user.ticks
       type: long
@@ -100,4 +100,3 @@
         The amount of CPU time spent in involuntary wait by the virtual CPU while the hypervisor
         was servicing another processor.
         Available only on Unix.
-

metricbeat/module/system/core/config.go

@@ -0,0 +1,46 @@
+package core
+
+import (
+	"strings"
+
+	"github.com/elastic/beats/libbeat/logp"
+	"github.com/pkg/errors"
+)
+
+// Core metric types.
+const (
+	percentages = "percentages"
+	ticks       = "ticks"
+)
+
+// Config for the system core metricset.
+type Config struct {
+	Metrics  []string `config:"core.metrics"`
+	CPUTicks *bool    `config:"cpu_ticks"` // Deprecated.
+}
+
+// Validate validates the core config.
+func (c Config) Validate() error {
+	if c.CPUTicks != nil {
+		logp.Deprecate("6.1", "cpu_ticks is deprecated. Add 'ticks' to the core.metrics list.")
+	}
+
+	if len(c.Metrics) == 0 {
+		return errors.New("core.metrics cannot be empty")
+	}
+
+	for _, metric := range c.Metrics {
+		switch strings.ToLower(metric) {
+		case percentages, ticks:
+		default:
+			return errors.Errorf("invalid core.metrics value '%v' (valid "+
+				"options are %v and %v)", metric, percentages, ticks)
+		}
+	}
+
+	return nil
+}
+
+var defaultConfig = Config{
+	Metrics: []string{percentages},
+}