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

[Monitoring] Bulk Uploader uses new ES client #94908

Merged

Conversation

afharo
Copy link
Member

@afharo afharo commented Mar 18, 2021

Summary

Resolves #94900.

Bulk Uploader uses an Elasticsearch client that connects to its own cluster (not the remote one). It used to extend the legacy client to provide support to the monitoring.bulk requests. Maintaining its own client required handling reconnections.

The new client provides that for free. This PR updates the Bulk Uploader to use the new client instead.

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@afharo afharo added release_note:skip Skip the PR/issue when compiling release notes v7.13.0 labels Mar 18, 2021
@afharo afharo force-pushed the monitoring/bulk_uploader/use-default-client branch from ec908b8 to 353ee37 Compare March 18, 2021 13:59
@afharo afharo marked this pull request as ready for review March 18, 2021 16:17
@afharo afharo added v7.12.1 and removed v7.12.0 labels Mar 18, 2021
@afharo afharo requested review from a team March 18, 2021 16:18
Copy link
Contributor

@igoristic igoristic left a comment

Choose a reason for hiding this comment

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

Tested, and everything checks out. Great job 🏆 Thank you for the quick fix!

Copy link
Contributor

@joshdover joshdover left a comment

Choose a reason for hiding this comment

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

tested locally and it worked, thanks!

@Bamieh
Copy link
Member

Bamieh commented Mar 22, 2021

@elasticmachine merge upstream

@afharo
Copy link
Member Author

afharo commented Mar 23, 2021

@elasticmachine merge upstream

@afharo afharo enabled auto-merge (squash) March 23, 2021 10:25
@afharo afharo added the auto-backport Deprecated - use backport:version if exact versions are needed label Mar 23, 2021
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@afharo afharo merged commit 1e6a024 into elastic:master Mar 23, 2021
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Mar 23, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@kibanamachine
Copy link
Contributor

💔 Backport failed

❌ 7.12: Commit could not be cherrypicked due to conflicts
7.x / #95153

Successful backport PRs will be merged automatically after passing CI.

To backport manually run:
node scripts/backport --pr 94908

kibanamachine added a commit that referenced this pull request Mar 23, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Alejandro Fernández Haro <alejandro.haro@elastic.co>
afharo added a commit to afharo/kibana that referenced this pull request Mar 23, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/monitoring/server/plugin.test.ts
#	x-pack/plugins/monitoring/server/plugin.ts
#	x-pack/plugins/monitoring/server/types.ts
@afharo afharo deleted the monitoring/bulk_uploader/use-default-client branch March 23, 2021 16:13
afharo added a commit that referenced this pull request Mar 23, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/monitoring/server/plugin.test.ts
#	x-pack/plugins/monitoring/server/plugin.ts
#	x-pack/plugins/monitoring/server/types.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes v7.12.1 v7.13.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Self monitoring stops uploading if connection to Elasticsearch is lost
6 participants