summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorac2550 <ac2550@intl.att.com>2018-03-27 13:31:03 +0200
committerac2550 <ac2550@intl.att.com>2018-03-27 13:31:03 +0200
commit792d8025006a1bd9ae46f8e6b4a48dde43418c26 (patch)
treee3e1241d4a2286f27ebc5eb1545b45977f6f933e
parent440d34023d8ad1864ebaecf6a7f70dd717710feb (diff)
Environment for logstash not seen by logstash
Change-Id: Ica3089a429920a8f3a17badba9d41c207923450d Issue-ID: CLAMP-124 Signed-off-by: ac2550 <ac2550@intl.att.com>
-rw-r--r--extra/docker/elk/.env11
-rw-r--r--extra/docker/elk/docker-compose.yml9
2 files changed, 9 insertions, 11 deletions
diff --git a/extra/docker/elk/.env b/extra/docker/elk/.env
index 4f1781d51..79d794306 100644
--- a/extra/docker/elk/.env
+++ b/extra/docker/elk/.env
@@ -1,13 +1,2 @@
# docker compose related
COMPOSE_PROJECT_NAME=clamp_elk
-
-# dmaap configuration for logstash
-dmaap_base_url=http://localhost:3904/
-dmaap_user=user
-dmaap_password=password
-dmaap_consumer_group=CG42
-dmaap_consumer_id=C42
-
-event_topic=EVENT_TOPIC
-notification_topic=NOTIFICATION_TOPIC
-request_topic=REQUEST_TOPIC
diff --git a/extra/docker/elk/docker-compose.yml b/extra/docker/elk/docker-compose.yml
index 9a610d0fe..3b7284d53 100644
--- a/extra/docker/elk/docker-compose.yml
+++ b/extra/docker/elk/docker-compose.yml
@@ -19,6 +19,15 @@ services:
- elasticsearch
networks:
es_net:
+ environment:
+ - dmaap_base_url=http://localhost:3904/
+ - dmaap_user=user
+ - dmaap_password=password
+ - dmaap_consumer_group=CG42
+ - dmaap_consumer_id=C42
+ - event_topic=EVENT_TOPIC
+ - notification_topic=NOTIFICATION_TOPIC
+ - request_topic=REQUEST_TOPIC
kibana:
image: kibana