Load template by default, depending on the version #1993
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
tsg
added
in progress
|
Not complete yet, but I'd like your feedback on the new config options @elastic/beats. |
| } | ||
| } | ||
|
|
||
| err = json.Unmarshal(body, &response) |
There was a problem hiding this comment.
make sure body is fully consumed and closed correctly. Otherwise underlying connection can not be re-used (go http module uses keep-alive in order to reuse TCP connections) + need to time out underlying connection in order to close socket.
There was a problem hiding this comment.
This should be the case already because the body is coming from a call to execHTTPRequest which does ReadAll and Close.
|
Comments mostly addressed, let's see if tests pass. |
|
jenkins, retest it |
|
jenkins, retest it |
| # These settings can be adjusted to load your own template or overwrite existing ones. | ||
|
|
||
| # Set to false to disable template loading. | ||
| # template.enabled: true |
|
LGTM. Only two minor comments. |
This queries Elasticsearch for the version and choses between the default template file (specified by the `template.path` option) and the ES 2x version of the template file (specified by the new `template.versions.2x.path` option). There's also a change in the defaults. With all the template options commented out, the code now loads the template. Previously, the template loading was the default via the sample configs only. I also did a small change in the output plugins API, now they receive the beatname in a clean way. Fixes elastic#1740.
|
LGTM. Waiting for green, but will ignore appveyor. |
tsg
pushed a commit
to tsg/beats
that referenced
this pull request
Jul 13, 2016
Since we removed the template stuff from the default config, we can add the user/pass instead so it's easy to enabled https. It also updates the sample user/pass used, to match the default in Shield, closing elastic#1735. Depends on elastic#1993.
ruflin
pushed a commit
that referenced
this pull request
Jul 13, 2016
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 queries Elasticsearch for the version and choses between the
default template file (specified by the
template.pathoption) andthe ES 2x version of the template file (specified by the new
template.versions.2x.pathoption).There's also a change in the defaults. With all the template
options commented out, the code now loads the template. Previously,
the template loading was the default via the sample configs only.
I also did a small change in the output plugins API, now they receive
the beatname in a clean way.
Fixes #1740.