Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #7871 to 6.3: Recover metrics for old apache versions #8555

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Recover metrics removed by mistake for old apache versions (#7871)
Removed by mistake on #6450

(cherry picked from commit a365e15)
  • Loading branch information
jsoriano committed Oct 3, 2018
commit ed7ec093da95447d16fab885b2a6f92ac2587406
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
@@ -40,6 +40,8 @@ https://github.com/elastic/beats/compare/v6.3.2...6.3[Check the HEAD diff]

*Metricbeat*

- Recover metrics for old apache versions removed by mistake on #6450. {pull}7871[7871]

*Packetbeat*

*Winlogbeat*
12 changes: 8 additions & 4 deletions metricbeat/module/apache/status/data.go
Original file line number Diff line number Diff line change
@@ -54,17 +54,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{
4 changes: 2 additions & 2 deletions metricbeat/tests/system/test_apache.py
Original file line number Diff line number Diff line change
@@ -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"
]