Merge pull request #2 from shazChaudhry/auth

Auth
shazChaudhry · Mar 21, 2017 · 6403b1e · 6403b1e
2 parents 69c652c + 17860eb
commit 6403b1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,11 +8,6 @@ services:
             - elasticsearchData:/usr/share/elasticsearch/data
         networks:
             - logging
-        environment:
-            xpack.security.enabled: "false"
-            xpack.monitoring.enabled: "false"
-            xpack.graph.enabled: "false"
-            xpack.watcher.enabled: "false"
 
     logstash:
         image: docker.elastic.co/logstash/logstash:5.2.2
@@ -22,19 +17,18 @@ services:
             - logging
         volumes:
             - ./elk/logstash/config/pipeline:/usr/share/logstash/pipeline
-            - ./elk/logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml
 
     kibana:
         image: docker.elastic.co/kibana/kibana:5.2.2
         ports:
             - 5601:5601
         networks:
             - logging
-        volumes:
-            - ./elk/kibana/config:/usr/share/kibana/config
-      
+        environment:
+            - ELASTICSEARCH_URL=http://elasticsearch:9200
+
 networks:
     logging:
- 
+
 volumes:
-    elasticsearchData:
+    elasticsearchData:
diff --git a/elk/logstash/config/pipeline/logstash.conf b/elk/logstash/config/pipeline/logstash.conf
@@ -21,6 +21,8 @@ filter {
 output {
   elasticsearch {
     hosts => ["elasticsearch:9200"]
+	user => "elastic"
+    password => "changeme"
   }
   # This will output every message on stdout.
   # It is great when testing your setup, but in