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

Index cluster_uuid in elasticsearch/node metricset #8771

Conversation

Projects
None yet
2 participants
@ycombinator
Copy link
Contributor

commented Oct 26, 2018

This PR teaches the elasticsearch/node metricset to index the Elasticsearch cluster_uuid as the module-level cluster.id field.

@ruflin

This comment has been minimized.

Copy link
Collaborator

commented Oct 29, 2018

There still seems to be some troubles with CI

@ycombinator ycombinator force-pushed the ycombinator:metricbeat-elasticsearch-node-cluster-id branch 2 times, most recently from e73e3ee to 7929f3d Oct 30, 2018

@ycombinator ycombinator force-pushed the ycombinator:metricbeat-elasticsearch-node-cluster-id branch from 7929f3d to 4d0e6f2 Nov 20, 2018

@ycombinator

This comment has been minimized.

Copy link
Contributor Author

commented Nov 20, 2018

@ruflin I addressed the CI troubles. Ready for your review again. Thanks!

@ruflin

ruflin approved these changes Nov 20, 2018

Copy link
Collaborator

left a comment

Overall LGTM. Should we add a changelog entry as we added a new field?

@@ -48,7 +48,6 @@ func TestFetch(t *testing.T) {
w.WriteHeader(200)
w.Header().Set("Content-Type", "application/json;")
w.Write([]byte(response))
assert.Equal(t, "/_nodes/_local", r.RequestURI)

This comment has been minimized.

Copy link
@ruflin

ruflin Nov 20, 2018

Collaborator

Is this not correct anymore?

This comment has been minimized.

Copy link
@ycombinator

ycombinator Nov 20, 2018

Author Contributor

It's correct but I removed it because none of the other tests that spin up a HTTP server like this have an assertion in them. Also, for some bizzare reason this test works locally, but only fails in CI.

This comment has been minimized.

Copy link
@ruflin

ruflin Nov 20, 2018

Collaborator

That it works locally and fails on CI makes me worry now because I think it passed previously.

This comment has been minimized.

Copy link
@ycombinator

ycombinator Nov 20, 2018

Author Contributor

Alright, digging into it some more...

This comment has been minimized.

Copy link
@ycombinator

ycombinator Nov 20, 2018

Author Contributor

My bad, I must've been mixing up PRs last night. This test clearly failed locally as well just now (several times) and the issue was obvious. Fixed it in 34310c1.

@ycombinator

This comment has been minimized.

Copy link
Contributor Author

commented Nov 21, 2018

jenkins, test this

1 similar comment
@ycombinator

This comment has been minimized.

Copy link
Contributor Author

commented Nov 21, 2018

jenkins, test this

ycombinator added some commits Oct 26, 2018

Removing problematic assert
None of the other test HTTP servers used in the Metricbeat codebase use an assertion like this so I thought it was safe to get rid of this one.

@ycombinator ycombinator force-pushed the ycombinator:metricbeat-elasticsearch-node-cluster-id branch from e01a5c5 to 0a00aa1 Nov 22, 2018

@ycombinator

This comment has been minimized.

Copy link
Contributor Author

commented Nov 22, 2018

@ruflin All the things are green now on this PR and review feedback has been addressed. Please take another gander whenever you get a chance. Thanks!

[EDIT] As mentioned in another PR comment, I'll add an overall CHANGELOG entry for all these fields in various ES metricsets in the final PR (yet to be put up).

@ruflin

ruflin approved these changes Nov 22, 2018

@ycombinator ycombinator merged commit 9bd2499 into elastic:master Nov 22, 2018

4 checks passed

CLA Commit author is a member of Elasticsearch
Details
Hound No violations found. Woof!
beats-ci Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

ycombinator added a commit to ycombinator/beats that referenced this pull request Nov 22, 2018

Index cluster_uuid in elasticsearch/node metricset (elastic#8771)
This PR teaches the `elasticsearch/node` metricset to index the Elasticsearch `cluster_uuid` as the module-level `cluster.id` field.

(cherry picked from commit 9bd2499)

vjsamuel added a commit to vjsamuel/beats that referenced this pull request Nov 22, 2018

Index cluster_uuid in elasticsearch/node metricset (elastic#8771)
This PR teaches the `elasticsearch/node` metricset to index the Elasticsearch `cluster_uuid` as the module-level `cluster.id` field.

ycombinator added a commit to ycombinator/beats that referenced this pull request Nov 26, 2018

Index cluster_uuid in elasticsearch/node metricset (elastic#8771)
This PR teaches the `elasticsearch/node` metricset to index the Elasticsearch `cluster_uuid` as the module-level `cluster.id` field.

(cherry picked from commit 9bd2499)

ycombinator added a commit that referenced this pull request Nov 26, 2018

Index cluster_uuid in elasticsearch/node metricset (#8771) (#9206)
This PR teaches the `elasticsearch/node` metricset to index the Elasticsearch `cluster_uuid` as the module-level `cluster.id` field.

(cherry picked from commit 9bd2499)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.