Install a Graylog index template instead of set mappings on index creation #1628
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
…ation In commit edf0d8b we changed the index creation process from "create index" + "install index mapping" to one operation to avoid race conditions. This broke setups where users had installed custom Elasticsearch index templates because the user templates where applied after our mapping was installed into the index. Before edf0d8b the user templates have been applied before we installed our mapping because the index creation was split into two steps. We now install a "graylog-internal" index template into Elasticsearch with a "order" or -99 to make sure user templates are able to override our settings. Fixes #1624
- Pass the ES config object intot the IndexCreatingLoadStrategyFactory to make sure the index is created with the correct settings. - Adjust index name in all fixtures.
| public boolean createIndexTemplate() { | ||
| final Map<String, Object> template = indexMapping.messageTemplate(allIndicesAlias(), configuration.getAnalyzer()); | ||
| final PutIndexTemplateRequest itr = c.admin().indices().preparePutTemplate(GRAYLOG_INTERNAL_TEMPLATE_NAME) | ||
| .setOrder(-99) // Make sure templates with "order: 0" are applied after our template! |
There was a problem hiding this comment.
Why -99 and not -1 or Integer.MIN_VALUE?
There was a problem hiding this comment.
I chose -99 because I didn't want to use -1 because we might need some space in the future. 😉
I will change it to Integer.MIN_VALUE.
This is needed to ensure that the template is created under all circumstances. This still leaves a race condition where the template is not propagated throughout the cluster when a new index gets created. Not much we can do about this right now.
|
Updated after some discussions. |
|
LGTM. 👍 |
joschi
added a commit
that referenced
this pull request
Dec 15, 2015
Install a Graylog index template instead of set mappings on index creation
joschi
added a commit
that referenced
this pull request
Dec 15, 2015
Install a Graylog index template instead of set mappings on index creation (cherry picked from commit 14db43e)
|
Merged into |
joschi
pushed a commit
that referenced
this pull request
Dec 17, 2015
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.
In commit edf0d8b we changed the index creation process from "create index" + "install index mapping" to one operation to avoid race conditions.
This broke setups where users had installed custom Elasticsearch index templates because the user templates where applied after our mapping was installed into the index. Before edf0d8b the user templates have been applied before we installed our mapping because the index creation was split into two steps.
We now install a "graylog-internal" index template into Elasticsearch with a "order" or -99 to make sure user templates are able to override our settings.
Fixes #1624