diff --git a/alerts/rules/log_error.yaml b/alerts/rules/log_error.yaml
index 1d2e465..e230c2d 100644
--- a/alerts/rules/log_error.yaml
+++ b/alerts/rules/log_error.yaml
@@ -3,7 +3,7 @@ es_host: jhipster-elasticsearch
 es_port: 9200
 name: log_error
 type: frequency
-index: logstash-*
+index: logs-*
 # link to a kibana dashboard with correct time settings
 use_kibana4_dashboard: "http://localhost:5601/app/kibana#/dashboard/d712f650-e0eb-11e7-9c68-0b9a0f0c183c"
 num_events: 1
diff --git a/docker-compose.yml b/docker-compose.yml
index ec1a82b..2d6f396 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,6 +60,7 @@ services:
         build: jhipster-zipkin/
         environment:
             - ES_HOSTS=http://jhipster-elasticsearch:9200
-            - ZIPKIN_UI_LOGS_URL=http://localhost:5601/app/kibana#/discover/d0682f20-e0e9-11e7-9c68-0b9a0f0c183c?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-30d,mode:quick,to:now))&_a=(columns:!(X-B3-TraceId,app_name,level,message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c,key:logger_name,negate:!t,params:(query:metrics,type:phrase),type:phrase,value:metrics),query:(match:(logger_name:(query:metrics,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'logstash-*',key:X-B3-TraceId,negate:!f,params:(query:'trace',type:phrase),type:phrase,value:'trace'),query:(match:(X-B3-TraceId:(query:'{traceId}',type:phrase))))),index:'logstash-*',interval:auto,query:(language:lucene,query:''),sort:!('@timestamp',asc))
+            - ES_INDEX=traces
+            - ZIPKIN_UI_LOGS_URL=http://localhost:5601/app/kibana#/discover/d0682f20-e0e9-11e7-9c68-0b9a0f0c183c?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-30d,mode:quick,to:now))&_a=(columns:!(X-B3-TraceId,app_name,level,message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c,key:logger_name,negate:!t,params:(query:metrics,type:phrase),type:phrase,value:metrics),query:(match:(logger_name:(query:metrics,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'logs-*',key:X-B3-TraceId,negate:!f,params:(query:'trace',type:phrase),type:phrase,value:'trace'),query:(match:(X-B3-TraceId:(query:'{traceId}',type:phrase))))),index:'logs-*',interval:auto,query:(language:lucene,query:''),sort:!('@timestamp',asc))
         ports:
             - 9411:9411
\ No newline at end of file
diff --git a/jhipster-alerter/Dockerfile b/jhipster-alerter/Dockerfile
index 134eb2f..f41573a 100644
--- a/jhipster-alerter/Dockerfile
+++ b/jhipster-alerter/Dockerfile
@@ -1,17 +1,18 @@
 FROM python:2.7-alpine
 
-RUN apk update && apk upgrade && apk add bash curl tar musl-dev linux-headers g++ libffi-dev libffi openssl-dev
+RUN apk update && apk upgrade && apk add bash curl tar musl-dev linux-headers g++ libffi-dev libffi openssl-dev libmagic
 
 ENV SET_CONTAINER_TIMEZONE=false \
     CONTAINER_TIMEZONE=UTC \
-    ELASTALERT_URL=https://github.com/Yelp/elastalert/archive/v0.1.33.tar.gz \
+    ELASTALERT_URL=https://github.com/Yelp/elastalert/archive/v0.1.36.tar.gz \
     ELASTALERT_HOME=/opt/elastalert \
     RULES_DIRECTORY=/opt/elastalert/rules \
     ES_HOST=jhipster-elasticsearch \
     USE_SSL=False \
     ES_PORT=9200 \
     ES_USERNAME="" \
-    ES_PASSWORD=""
+    ES_PASSWORD="" \
+    ES_INDEX="alerts"
 
 RUN mkdir -p /opt/elastalert
 
diff --git a/jhipster-alerter/config.yaml b/jhipster-alerter/config.yaml
index b86d0d4..493f0a2 100644
--- a/jhipster-alerter/config.yaml
+++ b/jhipster-alerter/config.yaml
@@ -15,7 +15,7 @@ buffer_time:
 # The index on es_host which is used for metadata storage
 # This can be a unmapped index, but it is recommended that you run
 # elastalert-create-index to set a mapping
-writeback_index: elastalert_status
+writeback_index: alerts
 
 # If an alert fails for some reason, ElastAlert will retry
 # sending the alert until this time period has elapsed
diff --git a/jhipster-alerter/start-elastalert.sh b/jhipster-alerter/start-elastalert.sh
index 1589011..7b36e5c 100644
--- a/jhipster-alerter/start-elastalert.sh
+++ b/jhipster-alerter/start-elastalert.sh
@@ -24,10 +24,10 @@ if ! curl -f $flags ${ES_HOST}:${ES_PORT} >/dev/null 2>&1
 then
 	echo "ES not available at ${ES_HOST}:${ES_PORT}"
 else
-	if ! curl -f $flags ${ES_HOST}:${ES_PORT}/elastalert_status >/dev/null 2>&1
+	if ! curl -f $flags ${ES_HOST}:${ES_PORT}/${ES_INDEX} >/dev/null 2>&1
 	then
 		echo "Creating Elastalert index in ES..."
-	    elastalert-create-index --index elastalert_status --old-index ""
+	    elastalert-create-index --index ${ES_INDEX} --old-index ""
 	else
 	    echo "Elastalert index already exists in ES."
 	fi
diff --git a/jhipster-console/logtrail.json b/jhipster-console/logtrail.json
index 0baeec8..1aeb560 100644
--- a/jhipster-console/logtrail.json
+++ b/jhipster-console/logtrail.json
@@ -2,7 +2,7 @@
   "index_patterns" : [
     {
       "es": {
-        "default_index": "logstash-*",
+        "default_index": "logs-*",
         "allow_url_parameter": false
       },
       "tail_interval_in_seconds": 10,
diff --git a/jhipster-curator/config/action_file.yml b/jhipster-curator/config/action_file.yml
index 05d859a..cbea9eb 100644
--- a/jhipster-curator/config/action_file.yml
+++ b/jhipster-curator/config/action_file.yml
@@ -2,9 +2,8 @@ actions:
   1:
     action: delete_indices
     description: >-
-       Delete indices older than ${UNIT_COUNT:1} ${UNIT:months} (based on index name), for logstash-
-       prefixed indices. Ignore the error if the filter does not result in an
-       actionable list of indices (ignore_empty_list) and exit cleanly.
+       Delete indices older than ${UNIT_COUNT:1} ${UNIT:months} (based on index name), for logs-*
+       prefixed indices.
     options:
       ignore_empty_list: True
       timeout_override:
@@ -13,7 +12,7 @@ actions:
     filters:
     - filtertype: pattern
       kind: prefix
-      value: logstash-
+      value: logs-
       exclude:
     - filtertype: age
       source: name
@@ -25,9 +24,8 @@ actions:
   2:
     action: delete_indices
     description: >-
-       Delete indices older than ${UNIT_COUNT:1} ${UNIT:months} (based on index name), for zipkin-
-       prefixed indices. Ignore the error if the filter does not result in an
-       actionable list of indices (ignore_empty_list) and exit cleanly.
+       Delete indices older than ${UNIT_COUNT:1} ${UNIT:months} (based on index name), for metrics-*
+       prefixed indices.
     options:
       ignore_empty_list: True
       timeout_override:
@@ -36,7 +34,29 @@ actions:
     filters:
     - filtertype: pattern
       kind: prefix
-      value: zipkin:span-
+      value: metrics-
+      exclude:
+    - filtertype: age
+      source: name
+      direction: older
+      timestring: '%Y.%m.%d'
+      unit: ${UNIT:months}
+      unit_count: ${UNIT_COUNT:1}
+      exclude:
+  3:
+    action: delete_indices
+    description: >-
+       Delete indices older than ${UNIT_COUNT:1} ${UNIT:months} (based on index name), for traces-
+       prefixed indices.
+    options:
+      ignore_empty_list: True
+      timeout_override:
+      continue_if_exception: True
+      disable_action: False
+    filters:
+    - filtertype: pattern
+      kind: prefix
+      value: traces-
       exclude:
     - filtertype: age
       source: name
diff --git a/jhipster-import-dashboards/Dockerfile b/jhipster-import-dashboards/Dockerfile
index 8590dee..cbf933b 100644
--- a/jhipster-import-dashboards/Dockerfile
+++ b/jhipster-import-dashboards/Dockerfile
@@ -1,8 +1,13 @@
 FROM docker.elastic.co/beats/metricbeat:6.4.1
 WORKDIR /usr/share/metricbeat/
 COPY dashboards/ ./
-COPY wait-for-elasticsearch.sh ./
+COPY wait-for-elasticsearch.sh set-logs-index-pattern-as-default.sh ./
 ENV ELASTICSEARCH_URL=http://jhipster-elasticsearch:9200
 ENV KIBANA_URL=http://jhipster-console:5601
 
-CMD ./wait-for-elasticsearch.sh  && ./metricbeat setup --dashboards -E output.elasticsearch.hosts="[$ELASTICSEARCH_URL]" -E setup.kibana.host=$KIBANA_URL -E setup.dashboards.directory=/usr/share/metricbeat/import
\ No newline at end of file
+CMD ./wait-for-elasticsearch.sh \
+    && ./metricbeat setup --dashboards \
+        -E output.elasticsearch.hosts="[$ELASTICSEARCH_URL]" \
+        -E setup.kibana.host=$KIBANA_URL \
+        -E setup.dashboards.directory=/usr/share/metricbeat/import \
+    && ./set-logs-index-pattern-as-default.sh
\ No newline at end of file
diff --git a/jhipster-import-dashboards/dashboards/import/6/dashboard/alerting-dashboard.json b/jhipster-import-dashboards/dashboards/import/6/dashboard/alerts-dashboard.json
similarity index 81%
rename from jhipster-import-dashboards/dashboards/import/6/dashboard/alerting-dashboard.json
rename to jhipster-import-dashboards/dashboards/import/6/dashboard/alerts-dashboard.json
index 819fbb8..b1034fc 100644
--- a/jhipster-import-dashboards/dashboards/import/6/dashboard/alerting-dashboard.json
+++ b/jhipster-import-dashboards/dashboards/import/6/dashboard/alerts-dashboard.json
@@ -11,7 +11,7 @@
         "description": "",
         "hits": 0,
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"elastalert-status\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[]}"
+          "searchSourceJSON": "{\"index\":\"alerts\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[]}"
         },
         "sort": [
           "@timestamp",
@@ -29,7 +29,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"elastalert-status\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"alerts\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         },
         "title": "Alert count by rule name",
         "uiStateJSON": "{\"vis\":{\"colors\":{\"log_error\":\"#C15C17\"}}}",
@@ -50,7 +50,7 @@
         "title": "Select Alert",
         "uiStateJSON": "{}",
         "version": 1,
-        "visState": "{\"title\":\"Select Alert\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1533889809924\",\"indexPattern\":\"elastalert-status\",\"fieldName\":\"rule_name\",\"parent\":\"\",\"label\":\"Rule name\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":5,\"order\":\"desc\"}},{\"id\":\"1533889817560\",\"indexPattern\":\"elastalert-status\",\"fieldName\":\"alert_sent\",\"parent\":\"\",\"label\":\"Alert sent\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":false,\"size\":5,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
+        "visState": "{\"title\":\"Select Alert\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1533889809924\",\"indexPattern\":\"alerts\",\"fieldName\":\"rule_name\",\"parent\":\"\",\"label\":\"Rule name\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":5,\"order\":\"desc\"}},{\"id\":\"1533889817560\",\"indexPattern\":\"alerts\",\"fieldName\":\"alert_sent\",\"parent\":\"\",\"label\":\"Alert sent\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":false,\"size\":5,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
       },
       "id": "eaa9d4c0-9c77-11e8-bfa6-a7fdcbb4d022",
       "type": "visualization",
@@ -59,7 +59,7 @@
     },
     {
       "attributes": {
-        "description": "",
+        "description": "View alerts",
         "hits": 0,
         "kibanaSavedObjectMeta": {
           "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
@@ -67,7 +67,7 @@
         "optionsJSON": "{\"darkTheme\":false,\"hidePanelTitles\":false,\"useMargins\":true}",
         "panelsJSON": "[{\"panelIndex\":\"1\",\"gridData\":{\"x\":0,\"y\":10,\"w\":48,\"h\":19,\"i\":\"1\"},\"embeddableConfig\":{},\"id\":\"739fb300-9c76-11e8-bfa6-a7fdcbb4d022\",\"type\":\"search\",\"version\":\"6.4.0\"},{\"panelIndex\":\"2\",\"gridData\":{\"x\":22,\"y\":0,\"w\":26,\"h\":10,\"i\":\"2\"},\"embeddableConfig\":{},\"id\":\"0d103f50-9c77-11e8-bfa6-a7fdcbb4d022\",\"type\":\"visualization\",\"version\":\"6.4.0\"},{\"panelIndex\":\"4\",\"gridData\":{\"x\":0,\"y\":0,\"w\":22,\"h\":10,\"i\":\"4\"},\"version\":\"6.4.0\",\"type\":\"visualization\",\"id\":\"eaa9d4c0-9c77-11e8-bfa6-a7fdcbb4d022\",\"embeddableConfig\":{}}]",
         "timeRestore": false,
-        "title": "alerting-dashboard",
+        "title": "alerts-dashboard",
         "version": 1
       },
       "id": "4161cd50-9c77-11e8-bfa6-a7fdcbb4d022",
diff --git a/jhipster-import-dashboards/dashboards/import/6/dashboard/jvm-dashboard.json b/jhipster-import-dashboards/dashboards/import/6/dashboard/jvm-dashboard.json
index 90e849a..9927a4a 100644
--- a/jhipster-import-dashboards/dashboards/import/6/dashboard/jvm-dashboard.json
+++ b/jhipster-import-dashboards/dashboards/import/6/dashboard/jvm-dashboard.json
@@ -4,7 +4,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         },
         "title": "Instances",
         "uiStateJSON": "{}",
@@ -19,7 +19,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.total*\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.total*\",\"language\":\"lucene\"}}"
         },
         "title": "JVM Total Memory",
         "uiStateJSON": "{}",
@@ -34,7 +34,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.heap*\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.heap*\",\"language\":\"lucene\"}}"
         },
         "title": "JVM Heap Memory",
         "uiStateJSON": "{}",
@@ -49,7 +49,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.heap*\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.heap*\",\"language\":\"lucene\"}}"
         },
         "title": "JVM Threads",
         "uiStateJSON": "{}",
@@ -79,7 +79,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.non-heap*\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[],\"query\":{\"query\":\"metric_name=jvm.memory.non-heap*\",\"language\":\"lucene\"}}"
         },
         "title": "JVM Non-Heap Memory",
         "uiStateJSON": "{}",
diff --git a/jhipster-import-dashboards/dashboards/import/6/dashboard/logs-dashboard.json b/jhipster-import-dashboards/dashboards/import/6/dashboard/logs-dashboard.json
index bb424e6..dbb9c9c 100644
--- a/jhipster-import-dashboards/dashboards/import/6/dashboard/logs-dashboard.json
+++ b/jhipster-import-dashboards/dashboards/import/6/dashboard/logs-dashboard.json
@@ -11,7 +11,7 @@
         "description": "",
         "hits": 0,
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c\",\"negate\":true,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"logger_name\",\"value\":\"metrics\",\"params\":{\"query\":\"metrics\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"logger_name\":{\"query\":\"metrics\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
+          "searchSourceJSON": "{\"index\":\"logs-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c\",\"negate\":true,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"logger_name\",\"value\":\"metrics\",\"params\":{\"query\":\"metrics\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"logger_name\":{\"query\":\"metrics\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
         },
         "sort": [
           "@timestamp",
@@ -35,7 +35,7 @@
         "description": "",
         "hits": 0,
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c\",\"negate\":true,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"logger_name\",\"value\":\"metrics\",\"params\":{\"query\":\"metrics\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"logger_name\":{\"query\":\"metrics\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
+          "searchSourceJSON": "{\"index\":\"logs-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c\",\"negate\":true,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"logger_name\",\"value\":\"metrics\",\"params\":{\"query\":\"metrics\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"logger_name\":{\"query\":\"metrics\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
         },
         "sort": [
           "@timestamp",
@@ -58,7 +58,7 @@
         "title": "Select Application",
         "uiStateJSON": "{}",
         "version": 1,
-        "visState": "{\"title\":\"Select Application\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1513348424847\",\"indexPattern\":\"logstash-*\",\"fieldName\":\"app_name.keyword\",\"label\":\"Application\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}},{\"id\":\"1513956661970\",\"indexPattern\":\"logstash-*\",\"fieldName\":\"instance_name.keyword\",\"label\":\"Instance\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}},{\"id\":\"1513958886954\",\"indexPattern\":\"logstash-*\",\"fieldName\":\"level.keyword\",\"label\":\"Log level\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":5,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true},\"aggs\":[]}"
+        "visState": "{\"title\":\"Select Application\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1513348424847\",\"indexPattern\":\"logs-*\",\"fieldName\":\"app_name.keyword\",\"label\":\"Application\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}},{\"id\":\"1513956661970\",\"indexPattern\":\"logs-*\",\"fieldName\":\"instance_name.keyword\",\"label\":\"Instance\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}},{\"id\":\"1513958886954\",\"indexPattern\":\"logs-*\",\"fieldName\":\"level.keyword\",\"label\":\"Log level\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":5,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true},\"aggs\":[]}"
       },
       "id": "08029590-e1a5-11e7-9e74-19a039e44384",
       "type": "visualization",
diff --git a/jhipster-import-dashboards/dashboards/import/6/dashboard/metrics-dashboard.json b/jhipster-import-dashboards/dashboards/import/6/dashboard/metrics-dashboard.json
index 96b3ce6..7607a29 100644
--- a/jhipster-import-dashboards/dashboards/import/6/dashboard/metrics-dashboard.json
+++ b/jhipster-import-dashboards/dashboards/import/6/dashboard/metrics-dashboard.json
@@ -4,7 +4,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         },
         "title": "Metric median value graph",
         "uiStateJSON": "{}",
@@ -19,7 +19,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[{\"meta\":{\"index\":\"c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"metric_type\",\"value\":\"TIMER\",\"params\":{\"query\":\"TIMER\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"metric_type\":{\"query\":\"TIMER\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}],\"query\":{\"query\":\"* -metric_name=com.codahale.metrics.*\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[{\"meta\":{\"index\":\"c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"metric_type\",\"value\":\"TIMER\",\"params\":{\"query\":\"TIMER\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"metric_type\":{\"query\":\"TIMER\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}],\"query\":{\"query\":\"* -metric_name=com.codahale.metrics.*\",\"language\":\"lucene\"}}"
         },
         "title": "Service statistics (global average)",
         "uiStateJSON": "{}",
@@ -39,7 +39,7 @@
         "title": "Select Metrics",
         "uiStateJSON": "{}",
         "version": 1,
-        "visState": "{\"title\":\"Select Metrics\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1513348526215\",\"indexPattern\":\"logstash-*\",\"fieldName\":\"instance_name.keyword\",\"label\":\"Instance\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":10,\"order\":\"desc\"}},{\"id\":\"1513348567660\",\"indexPattern\":\"logstash-*\",\"fieldName\":\"metric_type.keyword\",\"label\":\"Metric Type\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":10,\"order\":\"desc\"}},{\"id\":\"1513348551531\",\"indexPattern\":\"logstash-*\",\"fieldName\":\"metric_name.keyword\",\"label\":\"Metric\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":10000,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true},\"aggs\":[]}"
+        "visState": "{\"title\":\"Select Metrics\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1513348526215\",\"indexPattern\":\"metrics\",\"fieldName\":\"instance_name.keyword\",\"label\":\"Instance\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":10,\"order\":\"desc\"}},{\"id\":\"1513348567660\",\"indexPattern\":\"metrics\",\"fieldName\":\"metric_type.keyword\",\"label\":\"Metric Type\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":10,\"order\":\"desc\"}},{\"id\":\"1513348551531\",\"indexPattern\":\"metrics\",\"fieldName\":\"metric_name.keyword\",\"label\":\"Metric\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":10000,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true},\"aggs\":[]}"
       },
       "id": "7406b6e0-e1a5-11e7-9e74-19a039e44384",
       "type": "visualization",
diff --git a/jhipster-import-dashboards/dashboards/import/6/dashboard/load-dashboard.json b/jhipster-import-dashboards/dashboards/import/6/dashboard/requests-dashboard.json
similarity index 93%
rename from jhipster-import-dashboards/dashboards/import/6/dashboard/load-dashboard.json
rename to jhipster-import-dashboards/dashboards/import/6/dashboard/requests-dashboard.json
index f107230..bb78fb0 100644
--- a/jhipster-import-dashboards/dashboards/import/6/dashboard/load-dashboard.json
+++ b/jhipster-import-dashboards/dashboards/import/6/dashboard/requests-dashboard.json
@@ -4,7 +4,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"logstash-*\",\"filter\":[],\"query\":{\"query\":\"*instrumentedFilter.request*\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"metrics\",\"filter\":[],\"query\":{\"query\":\"*instrumentedFilter.request*\",\"language\":\"lucene\"}}"
         },
         "title": "Request rate",
         "uiStateJSON": "{}",
@@ -25,7 +25,7 @@
         "optionsJSON": "{\"darkTheme\":true,\"useMargins\":false,\"hidePanelTitles\":false}",
         "panelsJSON": "[{\"panelIndex\":\"1\",\"gridData\":{\"x\":0,\"y\":0,\"w\":12,\"h\":7,\"i\":\"1\"},\"version\":\"6.1.0\",\"type\":\"visualization\",\"id\":\"9a0907c0-e0f2-11e7-9c68-0b9a0f0c183c\"}]",
         "timeRestore": false,
-        "title": "load-dashboard",
+        "title": "requests-dashboard",
         "uiStateJSON": "{}",
         "version": 1
       },
diff --git a/jhipster-import-dashboards/dashboards/import/6/dashboard/traces-dashboard.json b/jhipster-import-dashboards/dashboards/import/6/dashboard/traces-dashboard.json
index 1a8a2c5..3826d11 100644
--- a/jhipster-import-dashboards/dashboards/import/6/dashboard/traces-dashboard.json
+++ b/jhipster-import-dashboards/dashboards/import/6/dashboard/traces-dashboard.json
@@ -4,7 +4,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"zipkin:span\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}"
+          "searchSourceJSON": "{\"index\":\"traces:span\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}"
         },
         "title": "Longest Traces durations",
         "uiStateJSON": "{}",
@@ -20,7 +20,7 @@
       "attributes": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"zipkin:span\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}"
+          "searchSourceJSON": "{\"index\":\"traces:span\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}"
         },
         "title": "Longest traces details",
         "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
diff --git a/jhipster-import-dashboards/dashboards/import/6/index-pattern/alerts.json b/jhipster-import-dashboards/dashboards/import/6/index-pattern/alerts.json
new file mode 100644
index 0000000..1aa1851
--- /dev/null
+++ b/jhipster-import-dashboards/dashboards/import/6/index-pattern/alerts.json
@@ -0,0 +1,11 @@
+{
+    "version": "6.4.1",
+    "objects": [
+      {
+         "attributes":{"title":"alerts","timeFieldName":"@timestamp","fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"aggregate_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"alert_info.type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"alert_info.type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"alert_sent\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"alert_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"match_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"rule_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"},
+        "version": 1,
+        "type": "index-pattern",
+        "id": "alerts"
+      }
+    ]
+  }
diff --git a/jhipster-import-dashboards/dashboards/import/6/index-pattern/elastalert-status.json b/jhipster-import-dashboards/dashboards/import/6/index-pattern/elastalert-status.json
deleted file mode 100644
index 9fe67af..0000000
--- a/jhipster-import-dashboards/dashboards/import/6/index-pattern/elastalert-status.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "version": "6.4.1",
-    "objects": [
-      {
-         "attributes":{"title":"elastalert_status","timeFieldName":"@timestamp","fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"aggregate_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"alert_info.type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"alert_info.type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"alert_sent\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"alert_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"match_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"rule_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"},
-        "version": 1,
-        "type": "index-pattern",
-        "id": "elastalert-status"
-      }
-    ]
-  }
diff --git a/jhipster-import-dashboards/dashboards/import/6/index-pattern/logstash-default.json b/jhipster-import-dashboards/dashboards/import/6/index-pattern/logs-default.json
similarity index 97%
rename from jhipster-import-dashboards/dashboards/import/6/index-pattern/logstash-default.json
rename to jhipster-import-dashboards/dashboards/import/6/index-pattern/logs-default.json
index 633a5e6..bbdc32f 100644
--- a/jhipster-import-dashboards/dashboards/import/6/index-pattern/logstash-default.json
+++ b/jhipster-import-dashboards/dashboards/import/6/index-pattern/logs-default.json
@@ -4,13 +4,13 @@
       {
         "attributes": {
           "fields": "[{\"name\":\"@metdata.ip_address\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"@metdata.ip_address.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"HOSTNAME\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"HOSTNAME.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"app_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"app_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"app_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"app_port.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"host.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"instance_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"instance_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"instance_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"instance_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"level\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"level_value\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"logger_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"logger_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_count\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_duration_unit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_duration_unit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_hystrix_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_hystrix_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_m1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_m15\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_m5\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_max\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_mean\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_mean_rate\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_median\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_method\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_method.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_min\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_p75\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_p95\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_p98\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_p99\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_p999\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_rate_unit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_rate_unit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_service\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_service.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_stddev\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"metric_value\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"port\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"stack_trace\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"stack_trace.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"tags.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"thread_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"thread_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"analyzed\":false,\"doc_values\":true,\"indexed\":true},{\"name\":\"X-B3-TraceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false}]",
-          "fieldFormatMap": "{\"@timestamp\":{\"id\":\"date\"},\"X-B3-TraceId\":{\"id\":\"url\",\"params\":{\"urlTemplate\":\"/app/kibana#/discover/d0682f20-e0e9-11e7-9c68-0b9a0f0c183c?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-30d,mode:quick,to:now))&_a=(columns:!(X-B3-TraceId,app_name,level,message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c,key:logger_name,negate:!t,params:(query:metrics,type:phrase),type:phrase,value:metrics),query:(match:(logger_name:(query:metrics,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'logstash-*',key:X-B3-TraceId,negate:!f,params:(query:{{value}},type:phrase),type:phrase,value:{{value}}),query:(match:(X-B3-TraceId:(query:{{value}},type:phrase))))),index:'logstash-*',interval:auto,query:(language:lucene,query:''),sort:!('@timestamp',asc))\",\"labelTemplate\":\"{{value}}\",\"openLinkInCurrentTab\":true}}}",
+          "fieldFormatMap": "{\"@timestamp\":{\"id\":\"date\"},\"X-B3-TraceId\":{\"id\":\"url\",\"params\":{\"urlTemplate\":\"/app/kibana#/discover/d0682f20-e0e9-11e7-9c68-0b9a0f0c183c?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-30d,mode:quick,to:now))&_a=(columns:!(X-B3-TraceId,app_name,level,message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:c7b73f10-e0e4-11e7-9c68-0b9a0f0c183c,key:logger_name,negate:!t,params:(query:metrics,type:phrase),type:phrase,value:metrics),query:(match:(logger_name:(query:metrics,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'logs-*',key:X-B3-TraceId,negate:!f,params:(query:{{value}},type:phrase),type:phrase,value:{{value}}),query:(match:(X-B3-TraceId:(query:{{value}},type:phrase))))),index:'logs-*',interval:auto,query:(language:lucene,query:''),sort:!('@timestamp',asc))\",\"labelTemplate\":\"{{value}}\",\"openLinkInCurrentTab\":true}}}",
           "timeFieldName": "@timestamp",
-          "title": "logstash-*"
+          "title": "logs-*"
         },
         "version": 1,
         "type": "index-pattern",
-        "id": "logstash-*"
+        "id": "logs-*"
       }
     ]
   }
diff --git a/jhipster-import-dashboards/dashboards/import/6/index-pattern/metrics.json b/jhipster-import-dashboards/dashboards/import/6/index-pattern/metrics.json
new file mode 100644
index 0000000..65dc0c2
--- /dev/null
+++ b/jhipster-import-dashboards/dashboards/import/6/index-pattern/metrics.json
@@ -0,0 +1,16 @@
+
+{
+    "version": "6.4.1",
+    "objects": [
+      {
+         "attributes": {
+          "title": "metrics-*",
+          "timeFieldName": "@timestamp",
+          "fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"app_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"app_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"app_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"app_port.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"instance_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"instance_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"level\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"level_value\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"logger_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"logger_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_count\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_duration_unit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"metric_duration_unit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_m1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_m15\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_m5\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_max\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_mean\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_mean_rate\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_median\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_min\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"metric_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_p75\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_p95\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_p98\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_p99\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_p999\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_rate_unit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"metric_rate_unit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_stddev\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"metric_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metric_value\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"port\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"tags.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"thread_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"thread_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
+        },
+        "version": 1,
+        "type": "index-pattern",
+        "id": "metrics"
+      }
+    ]
+  }
diff --git a/jhipster-import-dashboards/dashboards/import/6/index-pattern/zipkin:span.json b/jhipster-import-dashboards/dashboards/import/6/index-pattern/traces.json
similarity index 89%
rename from jhipster-import-dashboards/dashboards/import/6/index-pattern/zipkin:span.json
rename to jhipster-import-dashboards/dashboards/import/6/index-pattern/traces.json
index a36bab0..62b0117 100644
--- a/jhipster-import-dashboards/dashboards/import/6/index-pattern/zipkin:span.json
+++ b/jhipster-import-dashboards/dashboards/import/6/index-pattern/traces.json
@@ -4,13 +4,14 @@
     "objects": [
       {
          "attributes": {
-          "title": "zipkin:span-*",
+          "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kind\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"localEndpoint.serviceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"parentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"remoteEndpoint.serviceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"shared\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"timestamp\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"timestamp_millis\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"traceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
           "timeFieldName": "timestamp_millis",
-          "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kind\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"localEndpoint.serviceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"parentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"remoteEndpoint.serviceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"shared\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"timestamp\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"timestamp_millis\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"traceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
+          "title": "traces:span-*",
+          "fieldFormatMap": "{\"traceId\":{\"id\":\"url\",\"params\":{\"urlTemplate\":\"http://localhost:9411/zipkin/traces/{{value}}\",\"labelTemplate\":\"{{value}}}\"}}}"
         },
         "version": 1,
         "type": "index-pattern",
-        "id": "zipkin:span"
+        "id": "traces:span"
       }
     ]
   }
diff --git a/jhipster-import-dashboards/set-logs-index-pattern-as-default.sh b/jhipster-import-dashboards/set-logs-index-pattern-as-default.sh
new file mode 100755
index 0000000..8a6dfdd
--- /dev/null
+++ b/jhipster-import-dashboards/set-logs-index-pattern-as-default.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Set logs-* as the default index pattern
+curl ${KIBANA_URL}/api/kibana/settings -H "Origin: ${KIBANA_URL}" -H 'kbn-version: 6.4.1' -H 'content-type: application/json' -H 'accept: application/json' -H "Referer: ${KIBANA_URL}/app/kibana" --data-binary '{"changes":{"defaultIndex":"logs-*"}}'
diff --git a/jhipster-import-dashboards/wait-for-elasticsearch.sh b/jhipster-import-dashboards/wait-for-elasticsearch.sh
index 785b219..d5e5d5b 100755
--- a/jhipster-import-dashboards/wait-for-elasticsearch.sh
+++ b/jhipster-import-dashboards/wait-for-elasticsearch.sh
@@ -7,6 +7,3 @@ while [ $WAIT -lt 300 ]; do
     sleep 1
     (( WAIT++ ))
 done
-
-# set logstash-* as the default index pattern
-curl ${KIBANA_URL}/api/kibana/settings -H "Origin: ${KIBANA_URL}" -H 'kbn-version: 6.4.1' -H 'content-type: application/json' -H 'accept: application/json' -H "Referer: ${KIBANA_URL}/app/kibana" --data-binary '{"changes":{"defaultIndex":"logstash-*"}}'
diff --git a/jhipster-logstash/logstash.conf b/jhipster-logstash/logstash.conf
index 586cd18..add6980 100644
--- a/jhipster-logstash/logstash.conf
+++ b/jhipster-logstash/logstash.conf
@@ -55,12 +55,21 @@ filter {
 }
 
 output {
-    elasticsearch {
-        hosts => ["${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"]
+    if [logger_name] =~ "metrics" {
+        elasticsearch {
+            hosts => ["${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"]
+            index => "metrics-%{+YYYY.MM.dd}"
+        }
+    } else {
+        elasticsearch {
+            hosts => ["${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"]
+            index => "logs-%{+YYYY.MM.dd}"
+        }
     }
     if [@metadata][LOGSTASH_DEBUG] == "true" {
         stdout { 
             codec => rubydebug
         }
     }
+
 }
diff --git a/jhipster-zipkin/Dockerfile b/jhipster-zipkin/Dockerfile
index 3432ba5..210336f 100644
--- a/jhipster-zipkin/Dockerfile
+++ b/jhipster-zipkin/Dockerfile
@@ -1,7 +1,8 @@
 FROM openzipkin/zipkin:2.11.5
 # Embed zipkin dependencies, a spark job to compute the graph between microservices
 ENV ZIPKIN_DEPENDENCIES_VERSION=2.0.1 \
-    STORAGE_TYPE=elasticsearch
+    STORAGE_TYPE=elasticsearch \
+    ES_INDEX=traces
 
 RUN curl -SL $ZIPKIN_REPO/io/zipkin/dependencies/zipkin-dependencies/$ZIPKIN_DEPENDENCIES_VERSION/zipkin-dependencies-$ZIPKIN_DEPENDENCIES_VERSION.jar > zipkin-dependencies.jar