Commit 6af0b20c authored by Mark Davidson's avatar Mark Davidson Committed by Antoine Cotten

Update to 5.4 (#120)

Includes required change for logstash config and disables the new machine learning functionality in x-pack by default.
parent 60387344
...@@ -14,6 +14,7 @@ services: ...@@ -14,6 +14,7 @@ services:
# https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling # https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
xpack.security.enabled: "false" xpack.security.enabled: "false"
xpack.monitoring.enabled: "false" xpack.monitoring.enabled: "false"
xpack.ml.enabled: "false"
xpack.graph.enabled: "false" xpack.graph.enabled: "false"
xpack.watcher.enabled: "false" xpack.watcher.enabled: "false"
networks: networks:
......
# https://github.com/elastic/elasticsearch-docker # https://github.com/elastic/elasticsearch-docker
FROM docker.elastic.co/elasticsearch/elasticsearch:5.3.0 FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.0
COPY config/ config/ COPY config/ config/
COPY bin/ bin/ COPY bin/ bin/
# Add your elasticsearch plugins setup here # Search Guard plugin
# Example: RUN elasticsearch-plugin install analysis-icu # https://github.com/floragunncom/search-guard/wiki
RUN elasticsearch-plugin install --batch com.floragunn:search-guard-5:5.3.0-11 \ RUN elasticsearch-plugin install --batch com.floragunn:search-guard-5:5.4.0-12 \
&& chmod +x \ && chmod +x \
plugins/search-guard-5/tools/hash.sh \ plugins/search-guard-5/tools/hash.sh \
plugins/search-guard-5/tools/sgadmin.sh plugins/search-guard-5/tools/sgadmin.sh
# Add your elasticsearch plugins setup here
# Example: RUN elasticsearch-plugin install analysis-icu
# https://github.com/elastic/kibana-docker # https://github.com/elastic/kibana-docker
FROM docker.elastic.co/kibana/kibana:5.3.0 FROM docker.elastic.co/kibana/kibana:5.4.0
# Search Guard plugin
# https://github.com/floragunncom/search-guard-docs/blob/master/kibana.md
RUN kibana-plugin install https://github.com/floragunncom/search-guard-kibana-plugin/releases/download/v5.4.0/searchguard-kibana-5.4.0-2.zip
# Add your kibana plugins setup here # Add your kibana plugins setup here
# Example: RUN kibana-plugin install <name|url> # Example: RUN kibana-plugin install <name|url>
RUN kibana-plugin install https://github.com/floragunncom/search-guard-kibana-plugin/releases/download/v5.3.0-1/searchguard-kibana-5.3.0-1.zip
...@@ -12,6 +12,7 @@ elasticsearch.url: http://elasticsearch:9200 ...@@ -12,6 +12,7 @@ elasticsearch.url: http://elasticsearch:9200
# #
xpack.security.enabled: false xpack.security.enabled: false
xpack.monitoring.enabled: false xpack.monitoring.enabled: false
xpack.ml.enabled: false
xpack.graph.enabled: false xpack.graph.enabled: false
xpack.reporting.enabled: false xpack.reporting.enabled: false
......
# https://github.com/elastic/logstash-docker # https://github.com/elastic/logstash-docker
FROM docker.elastic.co/logstash/logstash:5.3.0 FROM docker.elastic.co/logstash/logstash:5.4.0
# Add your logstash plugins setup here # Add your logstash plugins setup here
# Example: RUN logstash-plugin install logstash-filter-json # Example: RUN logstash-plugin install logstash-filter-json
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
## from https://github.com/elastic/logstash-docker/blob/master/build/logstash/config/logstash.yml ## from https://github.com/elastic/logstash-docker/blob/master/build/logstash/config/logstash.yml
# #
http.host: "0.0.0.0" http.host: "0.0.0.0"
path.config: /usr/share/logstash/pipeline
## Disable X-Pack ## Disable X-Pack
## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html ## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
## https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling ## https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
# #
xpack.monitoring.enabled: false xpack.monitoring.enabled: false
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment