Get policy in CsarInstaller

[clamp.git] / extra / docker / elk / docker-compose.yml

diff --git a/extra/docker/elk/docker-compose.yml b/extra/docker/elk/docker-compose.yml
index 3c5652a..8865638 100644 (file)
--- a/extra/docker/elk/docker-compose.yml
+++ b/extra/docker/elk/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3
+    image: onap/clamp-dashboard-elasticsearch:latest
     ports:
       - 9200:9200
     networks:
@@ -15,11 +15,13 @@ services:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 
   logstash:
-    image: docker.elastic.co/logstash/logstash-oss:6.1.3
+    image: onap/clamp-dashboard-logstash:latest
+    build:
+      context: ../../../src/main/docker/logstash
+      dockerfile: Dockerfile.logstash
     volumes:
-      - ./logstash-conf:/config-dir
+      - ../../../src/main/docker/logstash/pipeline:/usr/share/logstash/pipeline
       - ./logstash-input:/log-input
-    command: logstash -f /config-dir/logstash.conf
     depends_on:
       - elasticsearch
     networks:
@@ -28,12 +30,14 @@ services:
       - dmaap_base_url=http://dmaapmocker: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
-      - elasticsearch_hosts=elasticsearch
+      - dmaap_consumer_group=clampdashboard
+      - dmaap_consumer_id=clampdashboard
+      - event_topic=DCAE-CL-EVENT
+      - notification_topic=POLICY-CL-MGT
+      - request_topic=APPC-CL
+      - elasticsearch_base_url=elasticsearch
+      - "LOGSTASH_USR=logstash"
+      - "LOGSTASH_PWD=logstash"
 
   kibana:
     image: onap/clamp-dashboard-kibana:latest
@@ -46,6 +50,8 @@ services:
       - elasticsearch
     volumes:
       - ../../../src/main/docker/kibana/saved-objects/:/saved-objects/
+      - ../../../src/main/docker/kibana/conf/kibana.yml:/usr/share/kibana/config/kibana.yml
+      - ../../../src/main/docker/kibana/conf/keystore:/usr/share/kibana/config/keystore
     networks:
       es_net: