From 792d8025006a1bd9ae46f8e6b4a48dde43418c26 Mon Sep 17 00:00:00 2001 From: ac2550 Date: Tue, 27 Mar 2018 13:31:03 +0200 Subject: [PATCH] Environment for logstash not seen by logstash Change-Id: Ica3089a429920a8f3a17badba9d41c207923450d Issue-ID: CLAMP-124 Signed-off-by: ac2550 --- extra/docker/elk/.env | 11 ----------- extra/docker/elk/docker-compose.yml | 9 +++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/extra/docker/elk/.env b/extra/docker/elk/.env index 4f1781d5..79d79430 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 9a610d0f..3b7284d5 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 -- 2.16.6