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

Cherry-pick #9165 to 6.x: Index cluster.id and cluster.name in elasticsearch/ml_job metricset #9173

Merged
merged 2 commits into from
Nov 21, 2018
Merged

Cherry-pick #9165 to 6.x: Index cluster.id and cluster.name in elasticsearch/ml_job metricset #9173

merged 2 commits into from
Nov 21, 2018

Conversation

ycombinator
Copy link
Contributor

Cherry-pick of PR #9165 to 6.x branch. Original message:

This PR teaches the elasticsearch/ml_job metricset to index the Elasticsearch cluster_uuid and cluster_name as the module-level cluster.id and cluster.name fields, respectively.

@ycombinator
Index cluster.id and cluster.name in elasticsearch/ml_job metricset (#…
8afee45 
…9165)

This PR teaches the `elasticsearch/ml_job` metricset to index the Elasticsearch `cluster_uuid` and `cluster_name` as the module-level `cluster.id` and `cluster.name` fields, respectively.

(cherry picked from commit e7f4a1c)
@ycombinator ycombinator requested a review from ruflin November 20, 2018 13:42
houndci-bot
houndci-bot reviewed Nov 20, 2018
View reviewed changes
metricbeat/module/elasticsearch/ml_job/data_test.go

// +build !integration

package ml_job
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't use an underscore in package name

ruflin
ruflin approved these changes Nov 20, 2018
View reviewed changes
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. For the data.json files we should update all of them at once in a follow up PR to have clean backports.

@ycombinator
Copy link
Contributor Author

ycombinator commented Nov 20, 2018 •
edited
Loading

For the data.json files we should update all of them at once in a follow up PR to have clean backports.

Sorry, I already started updating the field name in all the PRs after your previous comment on the other PR. So I'm going through with it on all the PRs now.

Since it's a small change (just one field), I think its okay to keep it in these backport PRs. That way we don't miss it. If it were a bigger change then I'd be in favor of a follow up PR instead.

@ycombinator
Copy link
Contributor Author

jenkins, test this

@ycombinator ycombinator merged commit 7aa4321 into elastic:6.x Nov 21, 2018
@ycombinator ycombinator deleted the backport_9165_6.x branch December 25, 2019 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@houndci-bot houndci-bot houndci-bot left review comments

@ruflin ruflin ruflin approved these changes

Assignees
No one assigned
Labels
backport review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ycombinator @ruflin @houndci-bot