Recover metrics removed by mistake for old apache versions (#7871) (#…

…8554)

Removed by mistake on #6450

(cherry picked from commit a365e15)

CHANGELOG.asciidoc

@@ -37,6 +37,7 @@ https://github.com/elastic/beats/compare/v6.4.1...6.4[Check the HEAD diff]
 
 *Metricbeat*
 
+- Recover metrics for old apache versions removed by mistake on #6450. {pull}7871[7871]
 - Avoid mapping issues in kubernetes module. {pull}8487[8487]
 
 *Packetbeat*

metricbeat/module/apache/status/data.go

@@ -71,17 +71,21 @@ var (
 
 	// Schema used till apache 2.4.12
 	schemaOld = s.Schema{
-		"total_accesses":   c.Int("Total Accesses"),
-		"total_kbytes":     c.Int("Total kBytes"),
-		"requests_per_sec": c.Float("ReqPerSec", s.Optional),
-		"bytes_per_sec":    c.Float("BytesPerSec", s.Optional),
+		"total_accesses":    c.Int("Total Accesses"),
+		"total_kbytes":      c.Int("Total kBytes"),
+		"requests_per_sec":  c.Float("ReqPerSec", s.Optional),
+		"bytes_per_sec":     c.Float("BytesPerSec", s.Optional),
+		"bytes_per_request": c.Float("BytesPerReq", s.Optional),
 		"workers": s.Object{
 			"busy": c.Int("BusyWorkers"),
 			"idle": c.Int("IdleWorkers"),
 		},
 		"uptime": s.Object{
 			"uptime": c.Int("Uptime"),
 		},
+		"cpu": s.Object{
+			"load": c.Float("CPULoad", s.Optional),
+		},
 		"connections": s.Object{
 			"total": c.Int("ConnsTotal", s.Optional),
 			"async": s.Object{

metricbeat/tests/system/test_apache.py

@@ -16,8 +16,8 @@
 
 APACHE_OLD_STATUS_FIELDS = [
     "hostname", "total_accesses", "total_kbytes",
-    "requests_per_sec", "bytes_per_sec",
-    "workers.busy", "workers.idle", "uptime",
+    "requests_per_sec", "bytes_per_sec", "bytes_per_request",
+    "workers.busy", "workers.idle", "uptime", "cpu",
     "connections", "scoreboard"
 ]