aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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