Skip to content

Commit

Permalink
Cherry-pick to 5.3: Make some Apache server status fields optional (#…
Browse files Browse the repository at this point in the history
…3816)

As they are not reported by some systems

Closes #3074
(cherry picked from commit 3b4a945)
  • Loading branch information
exekias authored and ruflin committed Mar 27, 2017
1 parent 47de60b commit 61fe1e9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ https://github.com/elastic/beats/compare/v5.3.0...master[Check the HEAD diff]

*Metricbeat*

- Avoid errors when some Apache status fields are missing. {issue}3074[3074]

*Packetbeat*

*Winlogbeat*
Expand Down
14 changes: 7 additions & 7 deletions metricbeat/module/apache/status/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ var (
"children_system": c.Float("CPUChildrenSystem"),
},
"connections": s.Object{
"total": c.Int("ConnsTotal"),
"total": c.Int("ConnsTotal", s.Optional),
"async": s.Object{
"writing": c.Int("ConnsAsyncWriting"),
"keep_alive": c.Int("ConnsAsyncKeepAlive"),
"closing": c.Int("ConnsAsyncClosing"),
"writing": c.Int("ConnsAsyncWriting", s.Optional),
"keep_alive": c.Int("ConnsAsyncKeepAlive", s.Optional),
"closing": c.Int("ConnsAsyncClosing", s.Optional),
},
},
"load": s.Object{
"1": c.Float("Load1"),
"5": c.Float("Load5"),
"15": c.Float("Load15"),
"1": c.Float("Load1", s.Optional),
"5": c.Float("Load5", s.Optional),
"15": c.Float("Load15", s.Optional),
},
}
)
Expand Down

0 comments on commit 61fe1e9

Please sign in to comment.