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

Cherry-pick #8308 to 6.x: Consistency in Elastic stack metricsets' code #8755

Merged
merged 1 commit into from Nov 5, 2018

Conversation

ycombinator
Copy link
Contributor

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

This PR makes error messages, reporting, and logging consistent across all metricsets for Elastic stack products, including the xpack monitoring code paths:

  • elasticsearch/ccr
  • elasticsearch/cluster_stats
  • elasticsearch/index
  • elasticsearch/index_recovery
  • elasticsearch/index_summary
  • elasticsearch/ml_job
  • elasticsearch/node
  • elasticsearch/node_stats
  • elasticsearch/pending_tasks
  • elasticsearch/shard
  • kibana/status
  • kibana/stats
  • logstash/node
  • logstash/node_stats

@ruflin
Copy link
Member

ruflin commented Oct 26, 2018

jenkins, test this

@ycombinator
Copy link
Contributor Author

jenkins, test this

* Consistent error handling in elasticsearch/cluster_stats metricset

* Consistent error handling in elasticsearch/index_recovery metricset

* Remove punctuation from error messages

* Inline variable

* Reordering imports

* Adding periods to the ends of godoc comments

* More consistency cleanup

* More consistency fixes

* More consistency fixes

* Fixing API path

* Consistent code in elasticsearch/pending_tasks metricset

* More code consistency

* Consistent code in elasticsearch/shard metricset

* Consistent code in elasticsearch/ccr metricset

* Making code in kibana module metricsets consistent

* Making fully-qualified metricset name consistent

* Use elasticsearch.ModuleName constant instead of string literal

* Making logstash/node metricset code consistent

* Making the logstash/node_stats metricset code consistent

* Refactoring common reporting and error pattern into helper function

* Updating unit tests

* Changes from running make fmt

* Re-running make fmt after downgrading golang to 10.3

* Fixes due to make update

* Updating LS module integration tests

* Update kibana/status integration test

* Report error with event (for non x-pack path)

* Attaching errors to events

* Fixing imports in integration tests

* Fixing error

(cherry picked from commit 3b2399d)
Copy link
Member

@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.

Skimmend through it and LGTM. I assume it's a direct commit backport.

For CI: Somehow heartbeat on Mac was skipped which should not be related.

@ycombinator ycombinator merged commit bb9fbc2 into elastic:6.x Nov 5, 2018
@ycombinator ycombinator deleted the backport_8308_6.x branch November 5, 2018 15:02
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.

None yet

2 participants