Merge branch 'fix80-kibana-config-location' into x-pack

README.md

@@ -4,8 +4,6 @@
 
 Run the latest version of the ELK (Elasticseach, Logstash, Kibana) stack with Docker and Docker-compose.
 
-**Note**: This version has [X-Pack support](https://www.elastic.co/products/x-pack).
-
 It will give you the ability to analyze any data set by using the searching/aggregation capabilities of Elasticseach and the visualization power of Kibana.
 
 Based on the official images:
@@ -14,6 +12,11 @@ Based on the official images:
 * [logstash](https://registry.hub.docker.com/_/logstash/)
 * [kibana](https://registry.hub.docker.com/_/kibana/)
 
+**Note**: Other branches in this project are available:
+
+* ELK 5 with X-Pack support: https://github.com/deviantony/docker-elk/tree/x-pack
+* ELK 5 in Vagrant: https://github.com/deviantony/docker-elk/tree/vagrant
+
 # Requirements
 
 ## Setup
@@ -60,10 +63,7 @@ Now that the stack is running, you'll want to inject logs in it. The shipped log
 $ nc localhost 5000 < /path/to/logfile.log
 ```
 
-And then access Kibana UI by hitting [http://localhost:5601](http://localhost:5601) with a web browser and use the following credentials to login:
-
-* user: *elastic*
-* password: *changeme*
+And then access Kibana UI by hitting [http://localhost:5601](http://localhost:5601) with a web browser.
 
 *NOTE*: You'll need to inject data into logstash before being able to create a logstash index in Kibana. Then all you should have to do is to hit the create button.
 

docker-compose.yml

@@ -24,7 +24,7 @@ services:
   kibana:
     build: kibana/
     volumes:
-      - ./kibana/config/:/opt/kibana/config/
+      - ./kibana/config/:/etc/kibana/
     ports:
       - "5601:5601"
     networks:

elasticsearch/Dockerfile

@@ -2,6 +2,4 @@ FROM elasticsearch:5
 
 ENV ES_JAVA_OPTS="-Des.path.conf=/etc/elasticsearch"
 
-RUN elasticsearch-plugin install --batch x-pack
-
 CMD ["-E", "network.host=0.0.0.0", "-E", "discovery.zen.minimum_master_nodes=1"]

logstash/config/logstash.conf

@@ -9,7 +9,5 @@ input {
 output {
 	elasticsearch {
 		hosts => "elasticsearch:9200"
-		user => "elastic"
-		password => "changeme"
 	}
 }