Update Monitoring plugin's Elasticsearch configuration #55119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Plugin now allows "keystore" and "truststore" values in its config schema as the documentation currently states. Plugin also now reads PEM and PKCS12 files off of the filesystem before attempting to create an Elasticsearch client.
Several Elasticsearch config deprecations were overlooked for monitoring-specific Elasticsearch settings.
jportner
added
Team:Security
|
Pinging @elastic/kibana-security (Team:Security) |
jportner
added
release_note:skip
|
Pinging @elastic/stack-monitoring (Team:Monitoring) |
|
@elasticmachine merge upstream |
This is causing a build failure during the DLL cleaning step.
igoristic
reviewed
Jan 17, 2020
igoristic
reviewed
Jan 17, 2020
x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.mocks.ts
Show resolved
Hide resolved
igoristic
reviewed
Jan 17, 2020
x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
Show resolved
Hide resolved
chrisronline
approved these changes
Jan 21, 2020
💚 Build SucceededHistory
To update your PR or re-run it, just comment with: |
jportner
added a commit
to jportner/kibana
that referenced
this pull request
Jan 21, 2020
* Fix Monitoring plugin Elasticsearch SSL config Plugin now allows "keystore" and "truststore" values in its config schema as the documentation currently states. Plugin also now reads PEM and PKCS12 files off of the filesystem before attempting to create an Elasticsearch client. * Add missing Elasticsearch config deprecations Several Elasticsearch config deprecations were overlooked for monitoring-specific Elasticsearch settings.
jportner
added a commit
that referenced
this pull request
Jan 21, 2020
* Fix Monitoring plugin Elasticsearch SSL config Plugin now allows "keystore" and "truststore" values in its config schema as the documentation currently states. Plugin also now reads PEM and PKCS12 files off of the filesystem before attempting to create an Elasticsearch client. * Add missing Elasticsearch config deprecations Several Elasticsearch config deprecations were overlooked for monitoring-specific Elasticsearch settings.
jportner
added a commit
that referenced
this pull request
Jan 21, 2020
* Fix Monitoring plugin Elasticsearch SSL config Plugin now allows "keystore" and "truststore" values in its config schema as the documentation currently states. Plugin also now reads PEM and PKCS12 files off of the filesystem before attempting to create an Elasticsearch client. * Add missing Elasticsearch config deprecations Several Elasticsearch config deprecations were overlooked for monitoring-specific Elasticsearch settings.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Monitoring plugin uses an Elasticsearch client to read monitoring data. This can be customized to read from a separate monitoring cluster using the
xpack.monitoring.elasticsearch.*settings.However, the Elasticsearch client was updated in #53810 to expect SSL certificates/keys to be read in before initializing the client, and the Monitoring plugin was not changed accordingly. This caused a crash when attempting to set Monitoring-specific Elasticsearch SSL settings (such as
certificateorkey).This PR fixes that problem, and also adds missing deprecations for Elasticsearch config settings (#48247, #54392) that will no longer be supported in 8.0.
Resolves #55073.