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

[7.9] [APM] Use observer.hostname (#76074) #76857

Merged
merged 8 commits into from
Sep 9, 2020

Conversation

dgieselaar
Copy link
Member

Backports the following commits to 7.9:

# Conflicts:
#	x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
#	x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@dgieselaar
Copy link
Member Author

@elasticmachine merge upstream

1 similar comment
@dgieselaar
Copy link
Member Author

@elasticmachine merge upstream

@dgieselaar
Copy link
Member Author

@elasticmachine merge upstream

gchaps and others added 5 commits September 9, 2020 10:57
…stic#76825)

# Conflicts:
#	x-pack/plugins/reporting/server/plugin.ts

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
…utes (elastic#74409) (elastic#76770)

* Add default Error handler. Try on /*setup & /epm/*

* Add return type. Rename interface

* Export error handler type & add comments

* use default error handler in installPackageHandler

* (re)-add comment
# Conflicts:
#	x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@dgieselaar dgieselaar changed the title [7.9] [APM] Use observer.hostname instead of observer.name (#76074) [7.9] [APM] Use observer.hostname (#76074) Sep 9, 2020
@dgieselaar dgieselaar merged commit e36d2ca into elastic:7.9 Sep 9, 2020
@dgieselaar dgieselaar deleted the backport/7.9/pr-76074 branch September 9, 2020 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants