diff options
| author |   Sébastien Determe <sd378r@intl.att.com> | 2018-03-27 16:20:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-27 16:20:35 +0000 |
| commit | 3a59c0fac35e21a5f7cff0c49d2a016e5ecf8998 (patch) | |
| tree | d3576639c092b77dd4bf056d4e1257a343efb28c /extra/docker | |
| parent | 191e98927b5eb288f7ba2ee983fc015c00536116 (diff) | |
| parent | 792d8025006a1bd9ae46f8e6b4a48dde43418c26 (diff) | |
Merge "Environment for logstash not seen by logstash"
Diffstat (limited to 'extra/docker')
| -rw-r--r-- | extra/docker/elk/.env | 11 | ||||
| -rw-r--r-- | 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 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 |