Add Elasticsearch version flag #1753
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
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
pavolloffay
requested review from
black-adder,
jpkrohling,
objectiser,
tiffon,
vprithvi and
yurishkuro
as code owners
objectiser
approved these changes
Aug 22, 2019
pkg/es/mocks/Client.go
Outdated
| @@ -1,24 +1,11 @@ | |||
| // Code generated by mockery v1.0.0. DO NOT EDIT. | |||
|
|
|||
| // Copyright (c) 2019 The Jaeger Authors. | |||
There was a problem hiding this comment.
Was this removed by the autogeneration?
There was a problem hiding this comment.
yes, the fmt goal adds it back
plugin/storage/es/options.go
Outdated
| @@ -96,6 +97,7 @@ func NewOptions(primaryNamespace string, otherNamespaces ...string) *Options { | |||
| TagDotReplacement: "@", | |||
| Enabled: true, | |||
| CreateIndexTemplates: true, | |||
| Version: 0, | |||
plugin/storage/es/options.go
Outdated
| flagSet.Uint( | ||
| nsConfig.namespace+suffixVersion, | ||
| 0, | ||
| "The major Elasticsearch version. The not specified value enables auto-detection from Elasticsearch API.") |
There was a problem hiding this comment.
"The not specified value ..." -> "If not specified, the value will be auto-detected from Elasticsearch"?
| @@ -40,16 +36,6 @@ type esTokenPropagationTestHandler struct { | |||
| } | |||
|
|
|||
| func (h *esTokenPropagationTestHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | |||
| // Return the elasticsearch version | |||
There was a problem hiding this comment.
Was this removed because it was a temporary workaround when the version wasn't available?
pavolloffay
changed the title
|
The version parameter was added to rollover in this PR #1769 |
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.
Follow up on #1690 (comment)
The elasticsearch version is by default automatically derived from ES API. I have added a flag which allows to specify the version. This can be used if for some reason the ping ES API is not available or it allows to use ES7 template with ES 6.8.x for easier migration to ES 7 (just wait for old indices to TLLout).
--es-archive.version uint The major Elasticsearch version. The not specified value enables auto-detection from Elasticsearch API. --es.version uint The major Elasticsearch version. The not specified value enables auto-detection from Elasticsearch API.