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 Input changes #6004

Merged
merged 5 commits into from
Jun 25, 2019
Merged

Conversation

dupondje
Copy link
Contributor

@dupondje dupondje commented Jun 18, 2019

closes #2711
closes #2650

Required for all PRs:

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

Fixing some long-standing issues in the elasticsearch plugin.
Still a lot of work todo, as it seems like ES6 isn't working correctly anymore?

Any chance to review (and eventrually merge) this first?
Cause I don't want to spend more time on fixing next issues if the base isn't going to be accepted :)

Jean-Louis Dupond added 2 commits June 18, 2019 15:03
Like described in influxdata#2650, the current implementation of isMaster was incorrect.
As calls were done concurrently, the isMaster value was prone to a race condition.
Also when multiple elasticsearch clusters were specified, this was broken.

To fix this, a map was added which contains the nodeID and masterID.
So for each node we know which one is master (if nodeID == masterID).

Test data taken from existing pull request.
The metric number_of_in_flight_fetch was not used in the cluster health.
Add it and sort the fields like they are printed by ElasticSearch.

Closes: influxdata#2779
@danielnelson danielnelson added this to the 1.12.0 milestone Jun 25, 2019
@danielnelson danielnelson added the fix pr to fix corresponding bug label Jun 25, 2019
@danielnelson danielnelson merged commit 83c8d7b into influxdata:master Jun 25, 2019
@dupondje dupondje deleted the elasticsearch branch July 2, 2019 08:02
bitcharmer pushed a commit to bitcharmer/telegraf that referenced this pull request Oct 18, 2019
athoune pushed a commit to bearstech/telegraf that referenced this pull request Apr 17, 2020
idohalevi pushed a commit to idohalevi/telegraf that referenced this pull request Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/elasticsearch fix pr to fix corresponding bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[elastic plugin] cluster health index-level stats + index node stats are merged into one measurement
2 participants