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.

Sign up for GitHub

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

Jump to bottom

Omit monitoring object from logstash_stats.logstash object #16198

Merged
merged 4 commits into from
Feb 12, 2020
Merged

Omit monitoring object from logstash_stats.logstash object #16198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f3ac30
Omit monitoring object from logstash_stats.logstash object
ycombinator Feb 7, 2020
7a2ac22
Removing unnecessary struct tag info
ycombinator Feb 7, 2020
cc7d3f2
Adding CHANGELOG entry
ycombinator Feb 7, 2020
127ea63
Adding explanatory comment for nodeInfo
ycombinator Feb 11, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add dedot for cloudwatch metric name. {issue}15916[15916] {pull}15917[15917]
- Fixed issue `logstash-xpack` module suddenly ceasing to monitor Logstash. {issue}15974[15974] {pull}16044[16044]
- Fix skipping protocol scheme by light modules. {pull}16205[pull]
- Made `logstash-xpack` module once again have parity with internally-collected Logstash monitoring data. {pull}16198[16198]

*Packetbeat*

Expand Down
11 changes: 9 additions & 2 deletions metricbeat/module/logstash/node_stats/data_xpack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,14 @@ type nodeInfo struct {
Status string `json:"status"`
HTTPAddress string `json:"http_address"`
Pipeline pipeline `json:"pipeline"`
Monitoring struct {
}

// inNodeInfo represents the Logstash node info to be parsed from the Logstash API
// response. It contains nodeInfo (which is also used as-is elsewhere) + monitoring
// information.
type inNodeInfo struct {
ycombinator marked this conversation as resolved.
Show resolved Hide resolved
nodeInfo
Monitoring struct {
ClusterID string `json:"cluster_uuid"`
} `json:"monitoring"`
}
Expand All @@ -108,7 +115,7 @@ type reloads struct {

// NodeStats represents the stats of a Logstash node
type NodeStats struct {
nodeInfo
inNodeInfo
commonStats
Process process `json:"process"`
OS os `json:"os"`
Expand Down