Skip to content

Commit

Permalink
Recover metrics removed by mistake for old apache versions (elastic#7871
Browse files Browse the repository at this point in the history
) (elastic#8554)

Removed by mistake on elastic#6450

(cherry picked from commit 9a4bcd2)
  • Loading branch information
jsoriano authored Oct 18, 2018
1 parent 5013e8d commit 3eacbf8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down
12 changes: 8 additions & 4 deletions metricbeat/module/apache/status/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/tests/system/test_apache.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]

Expand Down

0 comments on commit 3eacbf8

Please sign in to comment.