update bootstrap.yml

.travis.yml

@@ -10,6 +10,7 @@ env:
     - APP=logstash
     - APP=zipkin
     - APP=import-dashboards
+    - APP=curator
 install:
   - docker version
   - docker build -f jhipster-"$APP"/Dockerfile -t jhipster/jhipster-"$APP":travis jhipster-"$APP"/

bootstrap/docker-compose.yml

@@ -1,37 +1,60 @@
 version: '2'
 services:
     jhipster-elasticsearch:
-        image: jhipster/jhipster-elasticsearch
+        image: jhipster/jhipster-elasticsearch:master
         ports:
             - 9200:9200
             - 9300:9300
-        ulimits:
-            memlock:
-                soft: 68719476736
-                hard: 68719476736
         # Uncomment this section to have elasticsearch data persisted to a volume
         #volumes:
         #   - ./log-data:/usr/share/elasticsearch/data
+
     jhipster-logstash:
-        image: jhipster/jhipster-logstash
-        command: logstash -f /conf/logstash.conf
+        image: jhipster/jhipster-logstash:master
+        environment:
+            - INPUT_TCP_PORT=5000
+            - INPUT_UDP_PORT=5000
+            - ELASTICSEARCH_HOST=jhipster-elasticsearch
+            - ELASTICSEARCH_PORT=9200
+            - LOGSTASH_DEBUG=false
         ports:
-            - 5000:5000/udp
+            - 5000:5000
         # Uncomment this section and add a logstash.conf file in log-conf/
         # to have logstash config loaded from a volume
         #volumes:
         #    - ./log-conf/:/conf
+
     jhipster-console:
-        image: jhipster/jhipster-console
+        image: jhipster/jhipster-console:master
         ports:
             - 5601:5601
         #environment:
-        #    - ELASTICSEARCH_URL=http://jhipster-elasticsearch:9200    
-        # Uncomment this section to have kibana JSON files loaded from a volume
-        #volumes:
-        #    - ./dashboards:/tmp/dashboards
+        #    - ELASTICSEARCH_URL=http://jhipster-elasticsearch:9200
+
+    jhipster-import-dashboards:
+        image: jhipster/jhipster-import-dashboards:edge
+        environment:
+            - ELASTICSEARCH_URL=http://jhipster-elasticsearch:9200
+        depends_on:
+            - jhipster-elasticsearch
+
+    # jhipster-curator:
+    #     image: jhipster/jhipster-curator
+    #     environment:
+    #         - ES_HOST=jhipster-elasticsearch
+    #         - UNIT_COUNT=7
+    #         - UNIT=days
+
     jhipster-alerter:
-        image: jhipster/jhipster-alerter
+        image: jhipster/jhipster-alerter:master
         #volumes:
-        #    - ./jhipster-alerter/rules/:/opt/elastalert/rules/
-        #    - ./alerts/config.yaml:/opt/elastalert/config.yaml
+        #    - ../jhipster-alerter/rules/:/opt/elastalert/rules/
+        #    - ../alerts/config.yaml:/opt/elastalert/config.yaml
+
+    jhipster-zipkin:
+        image: jhipster/jhipster-zipkin:master
+        environment:
+            - ES_HOSTS=http://jhipster-elasticsearch:9200
+            - ZIPKIN_UI_LOGS_URL=http://localhost:5601/app/kibana#/dashboard/logs-dashboard?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-1h,mode:quick,to:now))&_a=(filters:!(),options:(darkTheme:!f),panels:!((col:1,id:logs-levels,panelIndex:2,row:1,size_x:6,size_y:3,type:visualization),(col:7,columns:!(stack_trace),id:Stacktraces,panelIndex:7,row:1,size_x:4,size_y:3,sort:!('@timestamp',desc),type:search),(col:11,id:Log-forwarding-instructions,panelIndex:8,row:1,size_x:2,size_y:3,type:visualization),(col:1,columns:!(app_name,message),id:All-logs,panelIndex:9,row:4,size_x:12,size_y:7,sort:!('@timestamp',asc),type:search)),query:(query_string:(analyze_wildcard:!t,query:'{traceId}')),title:logs-dashboard,uiState:())
+        ports:
+            - 9411:9411