Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 5.4 #120

Merged
merged 3 commits into from
May 8, 2017
Merged

Update to 5.4 #120

merged 3 commits into from
May 8, 2017

Conversation

mtdavidson
Copy link
Contributor

Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.

Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.
Copy link
Collaborator

@antoineco antoineco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I'll merge it after my 2 comments are addressed. Also beware that you committed with an anonymous Github user (not sure if that was intentional).

## The path to the Logstash config for the main pipeline.
## see https://www.elastic.co/guide/en/logstash/current/logstash-settings-file.html
#
path.config: /usr/share/logstash/pipeline
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already defaults to /usr/share/logstash/pipeline so this should be removed. See https://www.elastic.co/guide/en/logstash/current/dir-layout.html

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was my thought as well but running it you get

logstash_1       | Sending Logstash's logs to /usr/share/logstash/logs which is now configured via log4j2.properties
logstash_1       | [2017-05-08T15:02:53,112][INFO ][logstash.setting.writabledirectory] Creating directory {:setting=>"path.queue", :path=>"/usr/share/logstash/data/queue"}
logstash_1       | usage:
logstash_1       |   bin/logstash -f CONFIG_PATH [-t] [-r] [] [-w COUNT] [-l LOG]
logstash_1       |   bin/logstash -e CONFIG_STR [-t] [--log.level fatal|error|warn|info|debug|trace] [-w COUNT] [-l LOG]
logstash_1       |   bin/logstash -i SHELL [--log.level fatal|error|warn|info|debug|trace]
logstash_1       |   bin/logstash -V [--log.level fatal|error|warn|info|debug|trace]
logstash_1       |   bin/logstash --help
logstash_1       | ERROR: No configuration file was specified. Perhaps you forgot to provide the '-f yourlogstash.conf' flag?
dockerelk_logstash_1 exited with code 1

Copy link
Collaborator

@antoineco antoineco May 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry! It was added as part of elastic/logstash-docker@303eafe, you're right. Can you just delete the comment and move it right below http.host: "0.0.0.0" then?

@@ -14,6 +14,7 @@ services:
# https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
xpack.security.enabled: "false"
xpack.monitoring.enabled: "false"
xpack.ml.enabled: "false"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes I missed that will get it corrected

mtdavidson and others added 2 commits May 8, 2017 16:05
- Also reorder so the default config is at the top
@antoineco antoineco merged commit aa06a82 into deviantony:master May 8, 2017
@antoineco
Copy link
Collaborator

Thanks a lot @mtdavidson !

@mtdavidson
Copy link
Contributor Author

No problem thanks for the quick merge :)

antoineco pushed a commit that referenced this pull request May 9, 2017
Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.
antoineco pushed a commit that referenced this pull request May 9, 2017
Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.
mnebuerquo pushed a commit to mnebuerquo/docker-elk that referenced this pull request Aug 8, 2017
Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.
herpiko pushed a commit to herpiko/docker-elk that referenced this pull request Jun 9, 2019
DanBrown47 pushed a commit to DanBrown47/docker-elk that referenced this pull request Jun 22, 2023
Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants