Package ingest-geoip as a module #36898
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
This commit moves ingest-geoip from being a plugin to being a module that is packaged with Elasticsearch distributions.
jasontedor
added
>enhancement
>breaking
:Delivery/Packaging
|
Pinging @elastic/es-core-infra |
|
Pinging @elastic/es-core-features |
jasontedor
commented
Dec 20, 2018
| @@ -222,6 +222,10 @@ void execute(Terminal terminal, String pluginId, boolean isBatch, Environment en | |||
| throw new UserException(ExitCodes.USAGE, "plugin id is required"); | |||
| } | |||
|
|
|||
| if ("ingest-geoip".equals(pluginId)) { | |||
There was a problem hiding this comment.
This change will be backported to 6.x to avoid breaking users there, and a note will be added to the migration guide. A follow-up will remove this handling in master so that 7.x will indeed report the usual error message.
jasontedor
commented
Dec 20, 2018
| @@ -231,6 +235,12 @@ void execute(Terminal terminal, String pluginId, boolean isBatch, Environment en | |||
| install(terminal, isBatch, extractedZip, env); | |||
| } | |||
|
|
|||
| private static void handleInstallIngestGeoIp() throws UserException { | |||
| throw new UserException( | |||
| ExitCodes.OK, | |||
There was a problem hiding this comment.
This is deliberately status code zero so as to avoid failing automation that relies on installing this plugin during deployment.
rjernst
reviewed
Dec 20, 2018
| @@ -84,6 +84,12 @@ void execute(Terminal terminal, Environment env, String pluginName, boolean purg | |||
| throw new UserException(ExitCodes.USAGE, "plugin name is required"); | |||
| } | |||
|
|
|||
| if ("ingest-geoip".equals(pluginName)) { | |||
There was a problem hiding this comment.
Don't they still need to be able to remove? What if they upgrade before removing the old plugin, then without the remove command working it would have to be done manually to avoid errors later?
There was a problem hiding this comment.
Good call @rjernst. I pushed a commit to address this. Let me know what you think.
rjernst
approved these changes
Dec 20, 2018
| e, | ||
| hasToString(Matchers.containsString( | ||
| "ingest-geoip is no longer a plugin but instead a module packaged with this distribution of Elasticsearch"))); | ||
| } |
There was a problem hiding this comment.
Can you please add a test here for the case the plugin is installed and it still gets removed?
jasontedor
commented
Dec 20, 2018
jasontedor
commented
Dec 20, 2018
qa/vagrant/src/test/resources/packaging/tests/70_sysv_initd.bats
Outdated
Show resolved
Hide resolved
|
Relates #36949 |
* master: (31 commits) Move ingest-geoip default databases out of config (elastic#36949) [ILM][DOCS] add extra scenario to policy update docs (elastic#36871) [Painless] Add String Casting Tests (elastic#36945) SQL: documentation improvements and updates (elastic#36918) [DOCS] Merges list of discovery and cluster formation settings (elastic#36909) Only compress responses if request was compressed (elastic#36867) Remove duplicate paragraph (elastic#36942) Fix URI to cluster stats endpoint on specific nodes (elastic#36784) Fix typo in unitTest task (elastic#36930) RecoveryMonitor#lastSeenAccessTime should be volatile (elastic#36781) [CCR] Add `ccr.auto_follow_coordinator.wait_for_timeout` setting (elastic#36714) Scripting: Remove deprecated params.ctx (elastic#36848) Refactor the REST actions to clarify what endpoints are deprecated. (elastic#36869) Add JDK 12 to CI rotation (elastic#36915) Improve error message for 6.x style realm settings (elastic#36876) Send clear session as routable remote request (elastic#36805) [DOCS] Remove redundant ILM attributes (elastic#36808) SQL: Fix bug regarding histograms usage in scripting (elastic#36866) Update index mappings when ccr restore complete (elastic#36879) Docs: Bump version to alpha2 after release ...
jasontedor
added a commit
that referenced
this pull request
Dec 22, 2018
This commit moves ingest-geoip from being a plugin to being a module that is packaged with Elasticsearch distributions.
|
Thank you for reviewing @jakelandis, @martijnvg, and @rjernst! |
This was referenced Dec 22, 2018
danielmitterdorfer
removed
the
:Data Management/Ingest Node
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.
This commit moves ingest-geoip from being a plugin to being a module that is packaged with Elasticsearch distributions.