diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 724f430652a1..6f16d90f5a33 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -74,6 +74,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff] - Fix incorrect type conversion of average response time in Haproxy dashboards {pull}8404[8404] - Added io disk read and write times to system module {issue}8473[8473] {pull}8508[8508] - Avoid mapping issues in kubernetes module. {pull}8487[8487] +- Recover metrics for old apache versions removed by mistake on #6450. {pull}7871[7871] - Fix dropwizard module parsing of metric names. {issue}8365[8365] {pull}6385[8385] *Packetbeat* diff --git a/metricbeat/module/apache/status/data.go b/metricbeat/module/apache/status/data.go index f20c61d02842..7659d161d2e3 100644 --- a/metricbeat/module/apache/status/data.go +++ b/metricbeat/module/apache/status/data.go @@ -71,10 +71,11 @@ 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"), @@ -82,6 +83,9 @@ var ( "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{ diff --git a/metricbeat/tests/system/test_apache.py b/metricbeat/tests/system/test_apache.py index 41f73c03bd1b..fd1645181201 100644 --- a/metricbeat/tests/system/test_apache.py +++ b/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" ]