From fc08c74e9d55e3bd7bac191c3821ff46ac0a3fea Mon Sep 17 00:00:00 2001 From: seb Date: Tue, 24 May 2016 07:26:54 +0200 Subject: [PATCH] upgraded Elasticsearch to 2.3.3 and Kibana to 4.5.1 --- Dockerfile | 6 +++--- README-short.txt | 2 +- README.md | 4 +++- docs/index.md | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c87f361a..a00560eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for ELK stack -# Elasticsearch 2.3.2, Logstash 2.3.2, Kibana 4.5.0 +# Elasticsearch 2.3.3, Logstash 2.3.2, Kibana 4.5.1 # Build with: # docker build -t /elk . @@ -37,7 +37,7 @@ RUN set -x \ ### install Elasticsearch -ENV ES_VERSION 2.3.2 +ENV ES_VERSION 2.3.3 RUN curl http://packages.elasticsearch.org/GPG-KEY-elasticsearch | apt-key add - RUN echo deb http://packages.elasticsearch.org/elasticsearch/2.x/debian stable main > /etc/apt/sources.list.d/elasticsearch-2.x.list @@ -71,7 +71,7 @@ RUN sed -i -e 's#^LS_HOME=$#LS_HOME='$LOGSTASH_HOME'#' /etc/init.d/logstash \ ### install Kibana -ENV KIBANA_VERSION 4.5.0 +ENV KIBANA_VERSION 4.5.1 ENV KIBANA_HOME /opt/kibana ENV KIBANA_PACKAGE kibana-${KIBANA_VERSION}-linux-x64.tar.gz diff --git a/README-short.txt b/README-short.txt index 7e3a33c7..4f6a2e76 100644 --- a/README-short.txt +++ b/README-short.txt @@ -1 +1 @@ -Collect, search and visualise log data with ELK (Elasticsearch 2.3.2, Logstash 2.3.2, Kibana 4.5.0). \ No newline at end of file +Collect, search and visualise log data with ELK (Elasticsearch 2.3.3, Logstash 2.3.2, Kibana 4.5.1). \ No newline at end of file diff --git a/README.md b/README.md index cd45eea0..2eff9505 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,9 @@ This Docker image provides a convenient centralised log server and log managemen The following tags are available: -- `es232_l232_k450`, `latest`: Elasticsearch 2.3.2, Logstash 2.3.2, and Kibana 4.5.0. +- `es233_l232_k451`, `latest`: Elasticsearch 2.3.3, Logstash 2.3.2, and Kibana 4.5.1. + +- `es232_l232_k450`: Elasticsearch 2.3.2, Logstash 2.3.2, and Kibana 4.5.0. - `es231_l231_k450`: Elasticsearch 2.3.1, Logstash 2.3.1, and Kibana 4.5.0. diff --git a/docs/index.md b/docs/index.md index 5d207000..a523f71a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -204,7 +204,7 @@ The following environment variables can be used to override the defaults used to - `LS_OPTS`: Logstash options (default: `"--auto-reload"` in images with tags `es231_l231_k450` and `es232_l232_k450`, `""` in `latest`) - **Warning** – As Logstash's auto-reload feature appears to create a resource leak (see [https://github.com/elastic/logstash/issues/5235](https://github.com/elastic/logstash/issues/5235)), the default `--auto-reload` option has been removed in the `latest` image at the time of writing (see [https://github.com/spujadas/elk-docker/issues/41](https://github.com/spujadas/elk-docker/issues/41)). For users of images with tags `es231_l231_k450` and `es232_l232_k450`, it is strongly recommended to override Logstash's options to disable the auto-reload feature by setting the `LS_OPTS` environment to `--no-auto-reload`. Future versions of the image may re-enable the auto-reload feature once the memory leak issue is fixed. + **Warning** – As Logstash's auto-reload feature (introduced in version 2.3) creates a resource leak in early 2.3.x versions (see [https://github.com/elastic/logstash/issues/5235](https://github.com/elastic/logstash/issues/5235)), the default `--auto-reload` option has been removed in the `es233_l232_k451` image at the time (see [https://github.com/spujadas/elk-docker/issues/41](https://github.com/spujadas/elk-docker/issues/41)). For users of images with tags `es231_l231_k450` and `es232_l232_k450`, it is strongly recommended to override Logstash's options to disable the auto-reload feature by setting the `LS_OPTS` environment to `--no-auto-reload`. Future versions of the image may re-enable the auto-reload feature once a stable version of Logstash is released with the memory leak issue fixed (should be version 2.3.3). As an illustration, the following command starts the stack, running Elasticsarch with a 2GB heap size, Logstash with a 1GB heap size and Logstash's configuration auto-reload disabled: