VOL-452 Integration of logstash in a swarm cluster
- Startup elasticsearch and logstash separately
- Added new targets in Makefile to build opennms and logstash images
- Default to the swarm kafka domain name

Change-Id: I1f7af5669b6bc270f3ed5c172f42d7e86933ef55
diff --git a/compose/docker-compose-elasticsearch.yml b/compose/docker-compose-elasticsearch.yml
index 3bc75fe..0b190b2 100644
--- a/compose/docker-compose-elasticsearch.yml
+++ b/compose/docker-compose-elasticsearch.yml
@@ -2,7 +2,7 @@
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:5.2.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.6.0
     environment:
       - transport.host=localhost
       - transport.tcp.port=9300
@@ -10,23 +10,3 @@
     ports:
       - "9200:9200"
       - "9300:9300"
-    networks:
-      - docker_elastic
-
-  logstash:
-    build: ./elasticsearch/logstash
-    environment:
-      - log.level=info
-    command: logstash -f /etc/logstash/conf.d/
-    volumes:
-      - ./elasticsearch/logstash/config:/etc/logstash/conf.d
-    ports:
-      - "5000:5000"
-    networks:
-      - docker_elastic
-    depends_on:
-      - elasticsearch
-
-networks:
-  docker_elastic:
-    driver: bridge