[BACKPORT] Enhance GET _node/stats/pipelines API for Metricbeat monitoring (#10576)#10909
Merged
cachedout merged 1 commit intoelastic:7.xfrom Jun 26, 2019
Merged
Conversation
…tic#10576) * parent 8c5697c author Guy Boertje <guy@elastic.co> 1556806171 +0100 committer Mike Place <mike.place@elastic.co> 1557234770 +0200 Bump JrJackson to 0.4.8 Fixes elastic#10748 LIR serializer refactor Remove commented code Remove more commented code Remove license and add encoding Style change to make code more vertical. eid and hash Use pipelines_info to construct the stats Add tests for new fields Add queue stats * bad merge resolution * bad merge resolution * Don't merge if nil * Better merge strategy * add vertex gate * Guard against nil * Use extended queue stats in pipeline report * Add cluster uuids to Elasticsearch outputters in pipeline output * move uuid * remove old uuid lookup * Only populate cluster_uuids when present * remove print * cluster_uuids -> cluster_uuid * Update logstash-core/lib/logstash/api/commands/stats.rb Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com> * Update logstash-core/lib/logstash/api/commands/stats.rb Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com> * Update logstash-core/lib/logstash/api/commands/stats.rb Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com> * Make var singular * Match singular var name * Remove unnecessary nil check * Pass in the matching pipeline for the report * Remove old way of inserting cluster_uuids * Update logstash-core/lib/logstash/api/commands/stats.rb I like this much better and in testing it seems to work correctly. Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com> * Remove unreferenced code that was part of debugging * Remove events var which was unused * Don't try to remove before insert * Update logstash-core/lib/logstash/api/commands/stats.rb Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com> * Make pipeline extended stats generation more efficient * Implement suggestion to improve readability * Cleaner merging per review recommendation * Only generate extended_stats once * remove unneeded comments * Add cluster_uuid to node vertex * remove top-level cluster_uuids * Update logstash-core/lib/logstash/api/commands/stats.rb Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com> * Implement change to make logic more simple suggested in review * Rely on options gate to insert graph Resolves concern here: elastic#10576 (comment) * Update logstash-core/lib/logstash/api/commands/stats.rb Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com> * Move UUID lookup to API layer * Move private method to bottom per review recommandation
|
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
yaauie
approved these changes
Jun 26, 2019
Member
yaauie
left a comment
There was a problem hiding this comment.
Backport looks clean; no surprises. LGTM 👍
Contributor
Author
|
Thanks for the quick review, @yaauie ! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
author Guy Boertje guy@elastic.co 1556806171 +0100
committer Mike Place mike.place@elastic.co 1557234770 +0200
Bump JrJackson to 0.4.8
Fixes #10748
LIR serializer refactor
Remove commented code
Remove more commented code
Remove license and add encoding
Style change to make code more vertical.
eid and hash
Use pipelines_info to construct the stats
Add tests for new fields
Add queue stats
bad merge resolution
bad merge resolution
Don't merge if nil
Better merge strategy
add vertex gate
Guard against nil
Use extended queue stats in pipeline report
Add cluster uuids to Elasticsearch outputters in pipeline output
move uuid
remove old uuid lookup
Only populate cluster_uuids when present
remove print
cluster_uuids -> cluster_uuid
Update logstash-core/lib/logstash/api/commands/stats.rb
Co-Authored-By: Ry Biesemeyer yaauie@users.noreply.github.com
Co-Authored-By: Ry Biesemeyer yaauie@users.noreply.github.com
Co-Authored-By: Ry Biesemeyer yaauie@users.noreply.github.com
Make var singular
Match singular var name
Remove unnecessary nil check
Pass in the matching pipeline for the report
Remove old way of inserting cluster_uuids
Update logstash-core/lib/logstash/api/commands/stats.rb
I like this much better and in testing it seems to work correctly.
Co-Authored-By: Ry Biesemeyer yaauie@users.noreply.github.com
Remove unreferenced code that was part of debugging
Remove events var which was unused
Don't try to remove before insert
Update logstash-core/lib/logstash/api/commands/stats.rb
Co-Authored-By: Ry Biesemeyer yaauie@users.noreply.github.com
Make pipeline extended stats generation more efficient
Implement suggestion to improve readability
Cleaner merging per review recommendation
Only generate extended_stats once
remove unneeded comments
Add cluster_uuid to node vertex
remove top-level cluster_uuids
Update logstash-core/lib/logstash/api/commands/stats.rb
Co-Authored-By: Ry Biesemeyer yaauie@users.noreply.github.com
Implement change to make logic more simple suggested in review
Rely on options gate to insert graph
Resolves concern here:
#10576 (comment)
Co-Authored-By: Ry Biesemeyer yaauie@users.noreply.github.com
Move UUID lookup to API layer
Move private method to bottom per review recommandation