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

[elasticsearch] Remove hostname matching logic #1657

Merged
merged 3 commits into from
Jun 9, 2015

Conversation

olivielpeau
Copy link
Member

The hostname matching is not needed anymore as:

Matching hostnames can also filter out legitimate data when the
local elasticsearch node reports a different hostname.

See also issue #457

@olivielpeau olivielpeau force-pushed the olivielpeau/remove-elasticsearch-hostname-matching branch from fa18ec5 to e0a3bc4 Compare June 4, 2015 19:24
# Check the interface addresses against the primary address
return primary_addrs in ips
for metric in stats_metrics:
desc = stats_metrics[metric]
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick but this loop can be simplified: for metric, desc in stats_metrics.iteritems(). This way is also usually faster than iterating and looking up by key

@olivielpeau olivielpeau force-pushed the olivielpeau/remove-elasticsearch-hostname-matching branch from e0a3bc4 to 8cbf5ac Compare June 5, 2015 22:59
@olivielpeau
Copy link
Member Author

Thanks for the review @talwai ! I've changed the loop.

@yannmh yannmh added this to the 5.4.0 milestone Jun 8, 2015
@LeoCavaille LeoCavaille force-pushed the olivielpeau/remove-elasticsearch-hostname-matching branch from 8cbf5ac to cc7f3f4 Compare June 9, 2015 19:10
olivielpeau and others added 3 commits June 9, 2015 16:05
The hostname matching is not needed anymore as:
- since PR #1181 we only ask the _local node for stats when `is_external` is set to `false`
- we don't match the hostname at all when `is_external` is `true`

Matching hostnames can also filter out legitimate data when the
local elasticsearch node reports a different hostname.

See also issue #457
It makes more sense overall, cluster_stats must be used when the user
targets an external URL (not localhost) and he wants to get stats for a
whole cluster, otherwise it will only query for the local node by
default.
Test new ES releases, add new branch 1.6.x.
Also not run the kill task in the `before_cache` section so that
SKIP_CLEANUP still works for instance.
@LeoCavaille LeoCavaille force-pushed the olivielpeau/remove-elasticsearch-hostname-matching branch from dab560a to 317ccf8 Compare June 9, 2015 20:05
yannmh added a commit that referenced this pull request Jun 9, 2015
…h-hostname-matching

[elasticsearch] Remove hostname matching logic
@yannmh yannmh merged commit 27a526b into master Jun 9, 2015
@yannmh yannmh deleted the olivielpeau/remove-elasticsearch-hostname-matching branch June 9, 2015 20:44
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 317ccf8 on olivielpeau/remove-elasticsearch-hostname-matching into ** on master**.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants