X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=extra%2Fdocker%2Felk%2Fdocker-compose.yml;h=29545bb8348af53d8c5dcf8f99d3e4cef257680d;hb=3ae0ad2234422c6660ae4fbdcf37e8e78dbf7e61;hp=ded2c6b01949b1b9de9f8d8708a199a19ce220ab;hpb=5082fd7ed2037dfdb9c37ae60b77bc3165262663;p=clamp.git

diff --git a/extra/docker/elk/docker-compose.yml b/extra/docker/elk/docker-compose.yml
index ded2c6b0..29545bb8 100644
--- a/extra/docker/elk/docker-compose.yml
+++ b/extra/docker/elk/docker-compose.yml
@@ -2,73 +2,54 @@ version: '3.1'
 
 services:
   elasticsearch:
-    image: elasticsearch
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2
     ports:
       - 9200:9200
     networks:
       es_net:
         aliases:
           - elasticsearch
+    environment:
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=false
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 
   logstash:
-    image: logstash
+    image: onap/clamp-dashboard-logstash:latest
+    build:
+      context: ../../../src/main/docker/logstash
+      dockerfile: Dockerfile.logstash
     volumes:
-      - ./logstash-conf:/config-dir
-    command: logstash -f /config-dir/logstash.conf
+      - ../../../src/main/docker/logstash/pipeline:/usr/share/logstash/pipeline
+      - ./logstash-input:/log-input
     depends_on:
       - elasticsearch
     networks:
       es_net:
     environment:
+      - dmaap_base_url=http://dmaapmocker:3904/
+      - dmaap_user=user
+      - dmaap_password=password
+      - 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
 
   kibana:
-    image: kibana
+    image: onap/clamp-dashboard-kibana:latest
+    build:
+      context: ../../../src/main/docker/kibana
+      dockerfile: Dockerfile.kibana
     ports:
       - 5601:5601
     depends_on:
       - elasticsearch
-    networks:
-      es_net:
-
-  backup:
-    image: taskrabbit/elasticsearch-dump
-    depends_on:
-      - elasticsearch
-    command:
-      - --input=http://elasticsearch:9200/.kibana
-      - --output=/backups/backup.json
-      - --type=data
     volumes:
-      - ./es_backup/:/backups/
+      - ../../../src/main/docker/kibana/saved-objects/:/saved-objects/
     networks:
       es_net:
 
-  restore:
-    image: taskrabbit/elasticsearch-dump
-    depends_on:
-      - elasticsearch
-    command:
-      - --output=http://elasticsearch:9200/.kibana
-      - --input=/backups/backup.json
-      - --type=data
-    volumes:
-      - ./es_backup/:/backups/
-    networks:
-      es_net:
-
-  default:
-    image: taskrabbit/elasticsearch-dump
-    depends_on:
-      - elasticsearch
-    command:
-      - --output=http://elasticsearch:9200/.kibana
-      - --input=/backups/default.json
-      - --type=data
-    volumes:
-      - ./es_backup/:/backups/
-    networks:
-      es_net:
-
-
 networks:
   es_net: