ugpraded ELK to version 6.0.0

spujadas · Nov 14, 2017 · fd776fc · fd776fc
1 parent 9e66c7f
commit fd776fc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile for ELK stack
-# Elasticsearch, Logstash, Kibana 6.0.0-rc2
+# Elasticsearch, Logstash, Kibana 6.0.0
 
 # Build with:
 # docker build -t <repo-user>/elk .
@@ -39,7 +39,7 @@ RUN set -x \
  && set +x
 
 
-ENV ELK_VERSION 6.0.0-rc2
+ENV ELK_VERSION 6.0.0
 
 ### install Elasticsearch
 

diff --git a/README-short.txt b/README-short.txt
@@ -1 +1 @@
-Collect, search and visualise log data with ELK (Elasticsearch 6.0.0-rc2, Logstash 6.0.0-rc2, Kibana 6.0.0-rc2).
+Collect, search and visualise log data with ELK (Elasticsearch 6.0.0, Logstash 6.0.0, Kibana 6.0.0).
diff --git a/README.md b/README.md
@@ -14,7 +14,9 @@ This image is hosted on Docker Hub at [https://hub.docker.com/r/sebp/elk/](https
 
 The following tags are available:
 
-- `latest`, `600-rc2`: ELK 6.0.0-rc2.
+- `latest`, `600`: ELK 6.0.0.
+
+- `600-rc2`: ELK 6.0.0-rc2.
 
 - `600-rc1`: ELK 6.0.0-rc1.
 

diff --git a/docs/index.md b/docs/index.md
@@ -232,7 +232,9 @@ The following environment variables can be used to override the defaults used to
 
 - `ES_CONNECT_RETRY`: number of seconds to wait for Elasticsearch to be up before starting Logstash and/or Kibana (default: `30`) 
 
-- `ES_PROTOCOL`: protocol to use to ping Elasticsearch's JSON interface URL (default: `http`) 
+- `ES_PROTOCOL`: protocol to use to ping Elasticsearch's JSON interface URL (default: `http`)
+
+	Note that this variable is only used to test if Elasticsearch is up when starting up the services. It is not used to update Elasticsearch's URL in Logstash's and Kibana's configuration files.  
 
 - `CLUSTER_NAME`: the name of the Elasticsearch cluster (default: automatically resolved when the container starts if Elasticsearch requires no user authentication).
 

diff --git a/nginx-filebeat/Dockerfile b/nginx-filebeat/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile to illustrate how Filebeat can be used with nginx
-# Filebeat 6.0.0-rc2
+# Filebeat 6.0.0
 
 # Build with:
 # docker build -t filebeat-nginx-example .
@@ -23,7 +23,7 @@ RUN apt-get update -qq \
  && apt-get install -qqy curl \
  && apt-get clean
 
-ENV FILEBEAT_VERSION 6.0.0-rc2
+ENV FILEBEAT_VERSION 6.0.0
 
 RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${FILEBEAT_VERSION}-amd64.deb \
  && dpkg -i filebeat-${FILEBEAT_VERSION}-amd64.deb \

diff --git a/spec/Dockerfile_spec.rb b/spec/Dockerfile_spec.rb
@@ -1,7 +1,7 @@
 require "docker"
 require "serverspec"
 
-ELK_VERSION = "6.0.0-rc2"
+ELK_VERSION = "6.0.0"
 ELASTICSEARCH_VERSION = ELK_VERSION
 LOGSTASH_VERSION = ELK_VERSION
 KIBANA_VERSION = ELK_VERSION