diff --git a/kibana/client/init.sls b/kibana/client/init.sls
index 675ddb9..1ab014e 100644
--- a/kibana/client/init.sls
+++ b/kibana/client/init.sls
@@ -4,12 +4,21 @@
   {%- set kibana_version = salt['pkg.version']('kibana') %}
 
   {%- if kibana_version is defined %}
-kibana_object_config:
+kibana_object_config_{{ kibana_version }}:
   kibana_object.present:
+  {%- if client.version in [4, 5] %}
   - kibana_content:
       defaultIndex: {{ client.get('default_index', {}) }}
   - name: {{ kibana_version }}
   - kibana_type: 'config'
+  {%- elif client.version == 6 %}
+  - kibana_content:
+      config:
+        defaultIndex: {{ client.get('default_index', {}) }}
+      type: config
+  - name: 'config:{{ kibana_version }}'
+  - kibana_type: 'doc'
+  {%- endif %}
 
   {%- for object_name, object in client.get('object', {}).iteritems() %}
     {%- if object.get('enabled', False) %}
@@ -20,17 +29,24 @@
         {%- set content = {} %}
       {%- endif %}
       {%- do salt['defaults.merge'](content, pillar_content) %}
-kibana_object_{{ object_name }}:
+
+kibana_object_{{ object.type }}_{{ object_name }}:
   kibana_object.present:
   - kibana_content: {{ content | json }}
+      {%- if client.version in [4, 5] %}
   - name: {{ object.id | default(object_name) }}
   - kibana_type: {{ object.type }}
+      {%- elif client.version == 6 %}
+  - name: {{ object.type }}:{{ object.id | default(object_name) }}
+  - kibana_type: "doc"
+      {%- endif %}
     {%- else %}
 
 kibana_object_{{ object_name }}:
   kibana_object.absent:
   - name: {{ object.id | default(object_name) }}
   - kibana_type: {{ object.type }}
+
     {%- endif %}
 
   {%- endfor %}
diff --git a/kibana/files/kibana.yml b/kibana/files/v4/kibana.yml
similarity index 100%
rename from kibana/files/kibana.yml
rename to kibana/files/v4/kibana.yml
diff --git a/kibana/files/objects/dashboard_logs.json b/kibana/files/v4/objects/dashboard_logs.json
similarity index 100%
rename from kibana/files/objects/dashboard_logs.json
rename to kibana/files/v4/objects/dashboard_logs.json
diff --git a/kibana/files/objects/dashboard_notifications.json b/kibana/files/v4/objects/dashboard_notifications.json
similarity index 100%
rename from kibana/files/objects/dashboard_notifications.json
rename to kibana/files/v4/objects/dashboard_notifications.json
diff --git a/kibana/files/objects/index-pattern_audit.json b/kibana/files/v4/objects/index-pattern_audit.json
similarity index 100%
rename from kibana/files/objects/index-pattern_audit.json
rename to kibana/files/v4/objects/index-pattern_audit.json
diff --git a/kibana/files/objects/index-pattern_logs.json b/kibana/files/v4/objects/index-pattern_logs.json
similarity index 100%
rename from kibana/files/objects/index-pattern_logs.json
rename to kibana/files/v4/objects/index-pattern_logs.json
diff --git a/kibana/files/objects/index-pattern_notifications.json b/kibana/files/v4/objects/index-pattern_notifications.json
similarity index 100%
rename from kibana/files/objects/index-pattern_notifications.json
rename to kibana/files/v4/objects/index-pattern_notifications.json
diff --git a/kibana/files/objects/search_audit.json b/kibana/files/v4/objects/search_audit.json
similarity index 100%
rename from kibana/files/objects/search_audit.json
rename to kibana/files/v4/objects/search_audit.json
diff --git a/kibana/files/objects/search_logs.json b/kibana/files/v4/objects/search_logs.json
similarity index 100%
rename from kibana/files/objects/search_logs.json
rename to kibana/files/v4/objects/search_logs.json
diff --git a/kibana/files/objects/search_notifications.json b/kibana/files/v4/objects/search_notifications.json
similarity index 100%
rename from kibana/files/objects/search_notifications.json
rename to kibana/files/v4/objects/search_notifications.json
diff --git a/kibana/files/objects/v4/visualization_EVENT-TYPE-BREAKDOWN.json b/kibana/files/v4/objects/visualization_EVENT-TYPE-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_EVENT-TYPE-BREAKDOWN.json
rename to kibana/files/v4/objects/visualization_EVENT-TYPE-BREAKDOWN.json
diff --git a/kibana/files/objects/v4/visualization_HOST-BREAKDOWN.json b/kibana/files/v4/objects/visualization_HOST-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_HOST-BREAKDOWN.json
rename to kibana/files/v4/objects/visualization_HOST-BREAKDOWN.json
diff --git a/kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json b/kibana/files/v4/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
rename to kibana/files/v4/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
diff --git a/kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json b/kibana/files/v4/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
rename to kibana/files/v4/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
diff --git a/kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json b/kibana/files/v4/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
rename to kibana/files/v4/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
diff --git a/kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json b/kibana/files/v4/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
rename to kibana/files/v4/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
diff --git a/kibana/files/objects/v4/visualization_NOTIFICATIONS-PER-SEVERITY.json b/kibana/files/v4/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_NOTIFICATIONS-PER-SEVERITY.json
rename to kibana/files/v4/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
diff --git a/kibana/files/objects/v4/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json b/kibana/files/v4/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
rename to kibana/files/v4/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
diff --git a/kibana/files/objects/v4/visualization_SOURCE-BREAKDOWN.json b/kibana/files/v4/objects/visualization_SOURCE-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_SOURCE-BREAKDOWN.json
rename to kibana/files/v4/objects/visualization_SOURCE-BREAKDOWN.json
diff --git a/kibana/files/objects/v4/visualization_TOP-10-HOSTS.json b/kibana/files/v4/objects/visualization_TOP-10-HOSTS.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_TOP-10-HOSTS.json
rename to kibana/files/v4/objects/visualization_TOP-10-HOSTS.json
diff --git a/kibana/files/objects/v4/visualization_TOP-10-PROGRAMS.json b/kibana/files/v4/objects/visualization_TOP-10-PROGRAMS.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_TOP-10-PROGRAMS.json
rename to kibana/files/v4/objects/visualization_TOP-10-PROGRAMS.json
diff --git a/kibana/files/objects/v4/visualization_TOP-10-SOURCES.json b/kibana/files/v4/objects/visualization_TOP-10-SOURCES.json
similarity index 100%
rename from kibana/files/objects/v4/visualization_TOP-10-SOURCES.json
rename to kibana/files/v4/objects/visualization_TOP-10-SOURCES.json
diff --git a/kibana/files/kibana.yml b/kibana/files/v5/kibana.yml
similarity index 100%
copy from kibana/files/kibana.yml
copy to kibana/files/v5/kibana.yml
diff --git a/kibana/files/objects/dashboard_logs.json b/kibana/files/v5/objects/dashboard_logs.json
similarity index 100%
copy from kibana/files/objects/dashboard_logs.json
copy to kibana/files/v5/objects/dashboard_logs.json
diff --git a/kibana/files/objects/dashboard_notifications.json b/kibana/files/v5/objects/dashboard_notifications.json
similarity index 100%
copy from kibana/files/objects/dashboard_notifications.json
copy to kibana/files/v5/objects/dashboard_notifications.json
diff --git a/kibana/files/objects/index-pattern_audit.json b/kibana/files/v5/objects/index-pattern_audit.json
similarity index 100%
copy from kibana/files/objects/index-pattern_audit.json
copy to kibana/files/v5/objects/index-pattern_audit.json
diff --git a/kibana/files/objects/index-pattern_logs.json b/kibana/files/v5/objects/index-pattern_logs.json
similarity index 100%
copy from kibana/files/objects/index-pattern_logs.json
copy to kibana/files/v5/objects/index-pattern_logs.json
diff --git a/kibana/files/objects/index-pattern_notifications.json b/kibana/files/v5/objects/index-pattern_notifications.json
similarity index 100%
copy from kibana/files/objects/index-pattern_notifications.json
copy to kibana/files/v5/objects/index-pattern_notifications.json
diff --git a/kibana/files/objects/search_audit.json b/kibana/files/v5/objects/search_audit.json
similarity index 100%
copy from kibana/files/objects/search_audit.json
copy to kibana/files/v5/objects/search_audit.json
diff --git a/kibana/files/objects/search_logs.json b/kibana/files/v5/objects/search_logs.json
similarity index 100%
copy from kibana/files/objects/search_logs.json
copy to kibana/files/v5/objects/search_logs.json
diff --git a/kibana/files/objects/search_notifications.json b/kibana/files/v5/objects/search_notifications.json
similarity index 100%
copy from kibana/files/objects/search_notifications.json
copy to kibana/files/v5/objects/search_notifications.json
diff --git a/kibana/files/objects/v5/visualization_EVENT-TYPE-BREAKDOWN.json b/kibana/files/v5/objects/visualization_EVENT-TYPE-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_EVENT-TYPE-BREAKDOWN.json
rename to kibana/files/v5/objects/visualization_EVENT-TYPE-BREAKDOWN.json
diff --git a/kibana/files/objects/v5/visualization_HOST-BREAKDOWN.json b/kibana/files/v5/objects/visualization_HOST-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_HOST-BREAKDOWN.json
rename to kibana/files/v5/objects/visualization_HOST-BREAKDOWN.json
diff --git a/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json b/kibana/files/v5/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
rename to kibana/files/v5/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
diff --git a/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json b/kibana/files/v5/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
rename to kibana/files/v5/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
diff --git a/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json b/kibana/files/v5/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
rename to kibana/files/v5/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
diff --git a/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json b/kibana/files/v5/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
rename to kibana/files/v5/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
diff --git a/kibana/files/objects/v5/visualization_NOTIFICATIONS-PER-SEVERITY.json b/kibana/files/v5/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_NOTIFICATIONS-PER-SEVERITY.json
rename to kibana/files/v5/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
diff --git a/kibana/files/objects/v5/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json b/kibana/files/v5/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
rename to kibana/files/v5/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
diff --git a/kibana/files/objects/v5/visualization_SOURCE-BREAKDOWN.json b/kibana/files/v5/objects/visualization_SOURCE-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_SOURCE-BREAKDOWN.json
rename to kibana/files/v5/objects/visualization_SOURCE-BREAKDOWN.json
diff --git a/kibana/files/objects/v5/visualization_TOP-10-HOSTS.json b/kibana/files/v5/objects/visualization_TOP-10-HOSTS.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_TOP-10-HOSTS.json
rename to kibana/files/v5/objects/visualization_TOP-10-HOSTS.json
diff --git a/kibana/files/objects/v5/visualization_TOP-10-PROGRAMS.json b/kibana/files/v5/objects/visualization_TOP-10-PROGRAMS.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_TOP-10-PROGRAMS.json
rename to kibana/files/v5/objects/visualization_TOP-10-PROGRAMS.json
diff --git a/kibana/files/objects/v5/visualization_TOP-10-SOURCES.json b/kibana/files/v5/objects/visualization_TOP-10-SOURCES.json
similarity index 100%
rename from kibana/files/objects/v5/visualization_TOP-10-SOURCES.json
rename to kibana/files/v5/objects/visualization_TOP-10-SOURCES.json
diff --git a/kibana/files/v6/kibana.yml b/kibana/files/v6/kibana.yml
new file mode 100644
index 0000000..b249a8f
--- /dev/null
+++ b/kibana/files/v6/kibana.yml
@@ -0,0 +1,67 @@
+{%- from "kibana/map.jinja" import server with context -%}
+
+############################### Elasticsearch #################################
+
+# The Elasticsearch instance to use for all your queries.
+elasticsearch.url: "http://{{ server.database.host }}:{{ server.database.port }}"
+
+# If your Elasticsearch is protected with basic authentication,
+# these settings provide the username and password that the Kibana
+# server uses to perform maintenance on the Kibana index at startup.
+# Your Kibana users still need to authenticate with Elasticsearch,
+# which is proxied through the Kibana server.
+# elasticsearch.username:
+# elasticsearch.password:
+
+# When this setting’s value is true Kibana uses the hostname
+# specified in the server.host setting. When the value of this
+# setting is false, Kibana uses the hostname of the host that
+# connects to this Kibana instance.
+elasticsearch.preserveHost: true
+
+# Time in milliseconds to wait for responses from the back end or
+# Elasticsearch. This value must be a positive integer.
+elasticsearch.requestTimeout: 300000
+
+# Time in milliseconds for Elasticsearch to wait for responses from shards.
+# Set to 0 to disable.
+elasticsearch.shardTimeout: 0
+
+
+############################### Server #################################
+
+# This setting specifies the default route when opening Kibana.
+# You can use this setting to modify the landing page when opening Kibana.
+server.defaultRoute: /app/kibana
+
+# This setting specifies the host of the back end server.
+server.host: {{ server.bind.address }}
+
+# Kibana is served by a back end server. This setting specifies the port to use.
+server.port: {{ server.bind.port }}
+
+############################### Kibana #################################
+
+# The default application to load.
+kibana.defaultAppId: {{ server.get("default_app_id", "/app/kibana") }}
+
+# Kibana uses an index in Elasticsearch to store saved searches, visualizations
+# and dashboards. It will create a new index if it doesn't already exist.
+kibana.index: ".kibana6"
+
+############################### X-Pack #################################
+
+xpack.apm.ui.enabled: false
+xpack.grokdebugger.enabled: false
+xpack.searchprofiler.enabled: false
+xpack.graph.enabled: false
+xpack.ml.enabled: false
+xpack.monitoring.enabled: false
+xpack.security.enabled: false
+xpack.infra.enabled: false
+xpack.logstash.enabled: false
+xpack.canvas.enabled: false
+
+################################ Apps ##################################
+
+timelion.enabled: false
diff --git a/kibana/files/v6/objects/dashboard_logs.json b/kibana/files/v6/objects/dashboard_logs.json
new file mode 100644
index 0000000..1a4fa97
--- /dev/null
+++ b/kibana/files/v6/objects/dashboard_logs.json
@@ -0,0 +1,18 @@
+{"dashboard":
+  {
+    "title": "Logs",
+    "hits": 0,
+    "description": "",
+    "panelsJSON": "[{\"col\":1,\"columns\":[\"Hostname\",\"Logger\",\"programname\",\"severity_label\",\"Payload\",\"environment_label\"],\"id\":\"search-logs\",\"panelIndex\":5,\"row\":13,\"size_x\":12,\"size_y\":12,\"sort\":[\"Timestamp\",\"desc\"],\"type\":\"search\"},{\"col\":1,\"id\":\"NUMBER-OF-LOG-MESSAGES-PER-SEVERITY\",\"panelIndex\":7,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"TOP-10-PROGRAMS\",\"panelIndex\":9,\"row\":5,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"LOG-MESSAGES-OVER-TIME-PER-SOURCE\",\"panelIndex\":10,\"row\":1,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"TOP-10-HOSTS\",\"panelIndex\":11,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"TOP-10-SOURCES\",\"panelIndex\":14,\"row\":5,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"LOG-MESSAGES-OVER-TIME-PER-SEVERITY\",\"panelIndex\":16,\"row\":1,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"}]",
+    "optionsJSON": "{\"darkTheme\":true}",
+    "uiStateJSON": "{\"P-10\":{\"vis\":{\"legendOpen\":true}},\"P-11\":{\"vis\":{\"colors\":{\"Count\":\"#629E51\"},\"legendOpen\":true}},\"P-12\":{\"spy\":{\"mode\":{\"fill\":false,\"name\":null}},\"vis\":{\"colors\":{\"Count\":\"#2F575E\"},\"legendOpen\":false}},\"P-14\":{\"vis\":{\"legendOpen\":true}},\"P-7\":{\"vis\":{\"legendOpen\":false}},\"P-9\":{\"vis\":{\"colors\":{\"Count\":\"#99440A\"},\"legendOpen\":true}}}",
+    "version": 1,
+    "timeRestore": true,
+    "timeTo": "now",
+    "timeFrom": "now-1h",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"
+    }
+  },
+  "type" : "dashboard"
+}
diff --git a/kibana/files/v6/objects/dashboard_notifications.json b/kibana/files/v6/objects/dashboard_notifications.json
new file mode 100644
index 0000000..12dd566
--- /dev/null
+++ b/kibana/files/v6/objects/dashboard_notifications.json
@@ -0,0 +1,18 @@
+{"dashboard":
+  {
+    "title": "Notifications",
+    "hits": 0,
+    "description": "",
+    "panelsJSON": "[{\"col\":1,\"columns\":[\"Logger\",\"publisher\",\"severity_label\",\"event_type\",\"old_state\",\"old_task_state\",\"state\",\"new_task_state\",\"environment_label\",\"display_name\"],\"id\":\"search-notifications\",\"panelIndex\":1,\"row\":14,\"size_x\":12,\"size_y\":11,\"sort\":[\"Timestamp\",\"desc\"],\"type\":\"search\"},{\"col\":1,\"id\":\"NOTIFICATIONS-OVER-TIME-PER-SOURCE\",\"panelIndex\":2,\"row\":1,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"NOTIFICATIONS-OVER-TIME-PER-SEVERITY\",\"panelIndex\":3,\"row\":1,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"EVENT-TYPE-BREAKDOWN\",\"panelIndex\":4,\"row\":5,\"size_x\":6,\"size_y\":5,\"type\":\"visualization\"},{\"col\":1,\"id\":\"SOURCE-BREAKDOWN\",\"panelIndex\":5,\"row\":5,\"size_x\":6,\"size_y\":5,\"type\":\"visualization\"},{\"col\":1,\"id\":\"HOST-BREAKDOWN\",\"panelIndex\":6,\"row\":10,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"NOTIFICATIONS-PER-SEVERITY\",\"panelIndex\":7,\"row\":10,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"}]",
+    "optionsJSON": "{\"darkTheme\":true}",
+    "uiStateJSON": "{\"P-4\":{\"vis\":{\"legendOpen\":true}},\"P-7\":{\"vis\":{\"legendOpen\":false}}}",
+    "version": 1,
+    "timeRestore": true,
+    "timeTo": "now",
+    "timeFrom": "now-1h",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"
+    }
+  },
+  "type" : "dashboard"
+}
diff --git a/kibana/files/v6/objects/index-pattern_audit.json b/kibana/files/v6/objects/index-pattern_audit.json
new file mode 100644
index 0000000..1aeecb5
--- /dev/null
+++ b/kibana/files/v6/objects/index-pattern_audit.json
@@ -0,0 +1,8 @@
+{"index-pattern":
+  {
+    "title" : "audit-*",
+    "timeFieldName" : "Timestamp",
+    "fields" : "[{\"name\":\"notification_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"Logger\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"environment_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"event_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"action\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"outcome\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Hostname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Severity\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Pid\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"Payload\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"severity_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]"
+  },
+  "type" : "index-pattern"
+}
diff --git a/kibana/files/v6/objects/index-pattern_logs.json b/kibana/files/v6/objects/index-pattern_logs.json
new file mode 100644
index 0000000..1dbe6f6
--- /dev/null
+++ b/kibana/files/v6/objects/index-pattern_logs.json
@@ -0,0 +1,8 @@
+{"index-pattern":
+  {
+    "title" : "log-*",
+    "timeFieldName" : "Timestamp",
+    "fields" :"[{\"name\":\"tenant_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"python_module\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"user_agent_os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"http_response_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"programname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Logger\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"openstack_region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"environment_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"user_agent_version\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"http_method\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"http_client_ip_address\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"http_response_size\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"deployment_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"remote_addr\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"Hostname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"http_version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Severity\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Pid\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"openstack_release\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"syslogfacility\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"http_url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"instance_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"openstack_roles\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"user_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"http_referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"user_agent_browser\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"http_status\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Payload\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"request_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"severity_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]"
+  },
+  "type" : "index-pattern"
+}
diff --git a/kibana/files/v6/objects/index-pattern_notifications.json b/kibana/files/v6/objects/index-pattern_notifications.json
new file mode 100644
index 0000000..1a0527f
--- /dev/null
+++ b/kibana/files/v6/objects/index-pattern_notifications.json
@@ -0,0 +1,8 @@
+{"index-pattern":
+  {
+    "title": "notification-*",
+    "timeFieldName" : "Timestamp",
+    "fields": "[{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"event_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"memory_mb\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"vcpus\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"old_task_state\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"severity_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"volume_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"Severity\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"terminated_at\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"image_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"Pid\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"instance_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"launched_at\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"hostname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"old_state\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"deployment_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"size\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"display_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"syslogfacility\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"new_task_state\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"environment_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"openstack_region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"openstack_release\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"openstack_roles\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"Type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"openstack_role\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"state\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"tenant_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Logger\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"publisher\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"created_at\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"programname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"user_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Hostname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"instance_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"availability_zone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"Payload\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"deleted_at\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"Timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"subnet_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"request_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"network_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"port_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"disk_gb\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]"
+  },
+  "type" : "index-pattern"
+}
diff --git a/kibana/files/v6/objects/search_audit.json b/kibana/files/v6/objects/search_audit.json
new file mode 100644
index 0000000..382dbb6
--- /dev/null
+++ b/kibana/files/v6/objects/search_audit.json
@@ -0,0 +1,22 @@
+{"search":
+  {
+    "title": "Audit",
+    "description": "",
+    "hits": 0,
+    "columns": [
+      "Logger",
+      "notification_type",
+      "outcome",
+      "Payload"
+    ],
+    "sort": [
+      "Timestamp",
+      "desc"
+    ],
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-audit\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}"
+    }
+  },
+  "type" : "search"
+}
diff --git a/kibana/files/v6/objects/search_logs.json b/kibana/files/v6/objects/search_logs.json
new file mode 100644
index 0000000..2c02663
--- /dev/null
+++ b/kibana/files/v6/objects/search_logs.json
@@ -0,0 +1,24 @@
+{"search":
+  {
+    "title": "Logs",
+    "description": "",
+    "hits": 0,
+    "columns": [
+      "Hostname",
+      "Logger",
+      "programname",
+      "severity_label",
+      "Payload",
+      "environment_label"
+    ],
+    "sort": [
+      "Timestamp",
+      "desc"
+    ],
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-log\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}"
+    }
+  },
+  "type" : "search"
+}
diff --git a/kibana/files/v6/objects/search_notifications.json b/kibana/files/v6/objects/search_notifications.json
new file mode 100644
index 0000000..9f10904
--- /dev/null
+++ b/kibana/files/v6/objects/search_notifications.json
@@ -0,0 +1,28 @@
+{"search":
+  {
+    "title": "Notifications",
+    "description": "",
+    "hits": 0,
+    "columns": [
+      "Logger",
+      "publisher",
+      "severity_label",
+      "event_type",
+      "old_state",
+      "old_task_state",
+      "state",
+      "new_task_state",
+      "environment_label",
+      "display_name"
+    ],
+    "sort": [
+      "Timestamp",
+      "desc"
+    ],
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-notification\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}"
+    }
+  },
+  "type" : "search"
+}
diff --git a/kibana/files/v6/objects/visualization_EVENT-TYPE-BREAKDOWN.json b/kibana/files/v6/objects/visualization_EVENT-TYPE-BREAKDOWN.json
new file mode 100644
index 0000000..b2d84ef
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_EVENT-TYPE-BREAKDOWN.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "EVENT TYPE BREAKDOWN",
+    "visState": "{\"title\":\"EVENT TYPE BREAKDOWN\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"grouped\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"\"}},{\"id\":\"2\",\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"event_type.keyword\",\"size\":30,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
+    "uiStateJSON": "{}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-notification\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_HOST-BREAKDOWN.json b/kibana/files/v6/objects/visualization_HOST-BREAKDOWN.json
new file mode 100644
index 0000000..247e30f
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_HOST-BREAKDOWN.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "HOST BREAKDOWN",
+    "visState": "{\"title\":\"HOST BREAKDOWN\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"Hostname.keyword\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Hostname\"}},{\"id\":\"3\",\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"severity_label.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
+    "uiStateJSON": "{}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-notification\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json b/kibana/files/v6/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
new file mode 100644
index 0000000..7d9404a
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "LOG MESSAGES OVER TIME PER SEVERITY",
+    "visState": "{\n  \"title\": \"LOG MESSAGES OVER TIME PER SEVERITY\",\n  \"type\": \"histogram\",\n  \"params\": {\n    \"shareYAxis\": true,\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"scale\": \"linear\",\n    \"mode\": \"stacked\",\n    \"times\": [],\n    \"addTimeMarker\": false,\n    \"defaultYExtents\": false,\n    \"setYExtents\": false,\n    \"yAxis\": {}\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"Timestamp\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"severity_label.keyword\",\n        \"size\": 15,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}",
+    "uiStateJSON": "{\n  \"vis\": {\n    \"colors\": {\n      \"ERROR\": \"#BF1B00\",\n      \"EMERGENCY\": \"#99440A\",\n      \"WARNING\": \"#EF843C\",\n      \"INFO\": \"#7EB26C\",\n      \"DEBUG\": \"#1F78C1\",\n      \"NOTICE\": \"#6ED0E0\",\n      \"ALERT\": \"#1F78C1\"\n    }\n  }\n}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\n  \"index\": \"index-template-log\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json b/kibana/files/v6/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
new file mode 100644
index 0000000..f2a8bc1
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "LOG MESSAGES OVER TIME PER SOURCE",
+    "visState": "{\n  \"title\": \"LOG MESSAGES OVER TIME PER SOURCE\",\n  \"type\": \"histogram\",\n  \"params\": {\n    \"shareYAxis\": true,\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"scale\": \"linear\",\n    \"mode\": \"stacked\",\n    \"times\": [],\n    \"addTimeMarker\": false,\n    \"defaultYExtents\": false,\n    \"setYExtents\": false,\n    \"yAxis\": {}\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"Timestamp\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"Logger.keyword\",\n        \"size\": 15,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}",
+    "uiStateJSON": "{}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\n  \"index\": \"index-template-log\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json b/kibana/files/v6/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
new file mode 100644
index 0000000..72fdd6d
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "NOTIFICATIONS OVER TIME PER SEVERITY",
+    "visState": "{\"title\":\"NOTIFICATIONS OVER TIME PER SEVERITY\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"Timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"severity_label.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
+    "uiStateJSON": "{\"vis\":{\"colors\":{\"ERROR\":\"#E24D42\"}}}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-notification\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json b/kibana/files/v6/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
new file mode 100644
index 0000000..da7ff06
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "NOTIFICATIONS OVER TIME PER SOURCE",
+    "visState": "{\n  \"title\": \"NOTIFICATIONS OVER TIME PER SOURCE\",\n  \"type\": \"histogram\",\n  \"params\": {\n    \"shareYAxis\": true,\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"scale\": \"linear\",\n    \"mode\": \"stacked\",\n    \"times\": [],\n    \"addTimeMarker\": false,\n    \"defaultYExtents\": false,\n    \"setYExtents\": false,\n    \"yAxis\": {}\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"Timestamp\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {}\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"Logger.keyword\",\n        \"size\": 20,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}",
+    "uiStateJSON": "{}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\n  \"index\": \"index-template-notification\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json b/kibana/files/v6/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
new file mode 100644
index 0000000..c77ca7a
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "NOTIFICATIONS PER SEVERITY",
+    "visState": "{\n  \"title\": \"New Visualization\",\n  \"type\": \"histogram\",\n  \"params\": {\n    \"shareYAxis\": true,\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"scale\": \"linear\",\n    \"mode\": \"stacked\",\n    \"times\": [],\n    \"addTimeMarker\": false,\n    \"defaultYExtents\": false,\n    \"setYExtents\": false,\n    \"yAxis\": {}\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"severity_label.keyword\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}",
+    "uiStateJSON": "{\n  \"vis\": {\n    \"colors\": {\n      \"ERROR\": \"#BF1B00\",\n      \"EMERGENCY\": \"#99440A\",\n      \"WARNING\": \"#EF843C\",\n      \"INFO\": \"#7EB26C\",\n      \"DEBUG\": \"#1F78C1\",\n      \"NOTICE\": \"#6ED0E0\",\n      \"ALERT\": \"#1F78C1\"\n    }\n  }\n}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\n  \"index\": \"index-template-notification\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json b/kibana/files/v6/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
new file mode 100644
index 0000000..b1f1a05
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "NUMBER OF LOG MESSAGES PER SEVERITY",
+    "visState": "{\"title\":\"NUMBER OF LOG MESSAGES PER SEVERITY\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"\"}},{\"id\":\"2\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"severity_label.keyword\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Number of log messages per severity\"}}],\"listeners\":{}}",
+    "uiStateJSON": "{\"vis\":{\"colors\":{\"Count\":\"#CCA300\"}}}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-log\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_SOURCE-BREAKDOWN.json b/kibana/files/v6/objects/visualization_SOURCE-BREAKDOWN.json
new file mode 100644
index 0000000..3ab2fdd
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_SOURCE-BREAKDOWN.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "SOURCE BREAKDOWN",
+    "visState": "{\"title\":\"New Visualization\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"grouped\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"Logger.keyword\",\"size\":15,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
+    "uiStateJSON": "{}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-notification\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_TOP-10-HOSTS.json b/kibana/files/v6/objects/visualization_TOP-10-HOSTS.json
new file mode 100644
index 0000000..90aff90
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_TOP-10-HOSTS.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "TOP 10 HOSTS",
+    "visState": "{\n  \"title\": \"TOP 10 HOSTS\",\n  \"type\": \"histogram\",\n  \"params\": {\n    \"shareYAxis\": true,\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"scale\": \"linear\",\n    \"mode\": \"stacked\",\n    \"times\": [],\n    \"addTimeMarker\": false,\n    \"defaultYExtents\": false,\n    \"setYExtents\": false,\n    \"yAxis\": {}\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"Hostname.keyword\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Nodes\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"severity_label.keyword\",\n        \"size\": 8,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}",
+    "uiStateJSON": "{\n  \"vis\": {\n    \"colors\": {\n      \"ERROR\": \"#BF1B00\",\n      \"EMERGENCY\": \"#99440A\",\n      \"WARNING\": \"#EF843C\",\n      \"INFO\": \"#7EB26C\",\n      \"DEBUG\": \"#1F78C1\",\n      \"NOTICE\": \"#6ED0E0\",\n      \"ALERT\": \"#1F78C1\"\n    }\n  }\n}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\n  \"index\": \"index-template-log\",\n  \"query\": {\n    \"query_string\": {\n      \"analyze_wildcard\": true,\n      \"query\": \"*\"\n    }\n  },\n  \"filter\": []\n}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_TOP-10-PROGRAMS.json b/kibana/files/v6/objects/visualization_TOP-10-PROGRAMS.json
new file mode 100644
index 0000000..3816671
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_TOP-10-PROGRAMS.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "TOP 10 PROGRAMS",
+    "visState": "{\n  \"title\": \"TOP 10 PROGRAMS\",\n  \"type\": \"histogram\",\n  \"params\": {\n    \"shareYAxis\": true,\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"scale\": \"linear\",\n    \"mode\": \"stacked\",\n    \"times\": [],\n    \"addTimeMarker\": false,\n    \"defaultYExtents\": false,\n    \"setYExtents\": false,\n    \"yAxis\": {}\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"programname.keyword\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Number of log messages per programname\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"severity_label.keyword\",\n        \"size\": 8,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}",
+    "uiStateJSON": "{\n  \"vis\": {\n    \"colors\": {\n      \"ERROR\": \"#BF1B00\",\n      \"EMERGENCY\": \"#99440A\",\n      \"WARNING\": \"#EF843C\",\n      \"INFO\": \"#7EB26C\",\n      \"DEBUG\": \"#1F78C1\",\n      \"NOTICE\": \"#6ED0E0\",\n      \"ALERT\": \"#1F78C1\"\n    }\n  }\n}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\n  \"index\": \"index-template-log\",\n  \"query\": {\n    \"query_string\": {\n      \"analyze_wildcard\": true,\n      \"query\": \"*\"\n    }\n  },\n  \"filter\": []\n}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/files/v6/objects/visualization_TOP-10-SOURCES.json b/kibana/files/v6/objects/visualization_TOP-10-SOURCES.json
new file mode 100644
index 0000000..e262983
--- /dev/null
+++ b/kibana/files/v6/objects/visualization_TOP-10-SOURCES.json
@@ -0,0 +1,13 @@
+{"visualization":
+  {
+    "title": "TOP 10 SOURCES",
+    "visState": "{\"title\":\"TOP 10 SOURCES\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"\"}},{\"id\":\"2\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"Logger.keyword\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Number of log messages per Logger\"}},{\"id\":\"3\",\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"severity_label.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
+    "uiStateJSON": "{\n  \"vis\": {\n    \"colors\": {\n      \"ERROR\": \"#BF1B00\",\n      \"EMERGENCY\": \"#99440A\",\n      \"WARNING\": \"#EF843C\",\n      \"INFO\": \"#7EB26C\",\n      \"DEBUG\": \"#1F78C1\",\n      \"NOTICE\": \"#6ED0E0\",\n      \"ALERT\": \"#1F78C1\"\n    }\n  }\n}",
+    "description": "",
+    "version": 1,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"index\":\"index-template-log\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"
+    }
+  },
+  "type" : "visualization"
+}
diff --git a/kibana/map.jinja b/kibana/map.jinja
index b19e6be..3d37b76 100644
--- a/kibana/map.jinja
+++ b/kibana/map.jinja
@@ -5,7 +5,6 @@
   service: kibana
   default_app_id: discover
 default:
-  version: 5
   cross_cluster_search: true
 {%- endload %}
 
diff --git a/kibana/meta/salt.yml b/kibana/meta/salt.yml
index 0c78c2b..5d8d5dc 100644
--- a/kibana/meta/salt.yml
+++ b/kibana/meta/salt.yml
@@ -4,5 +4,9 @@
     {%- from "kibana/map.jinja" import client with context %}
     kibana:
       kibana_url: {{ client.server.host }}:{{ client.server.port }}
+      {%- if client.version == 6 %}
+      kibana_index: ".kibana6"
+      {%- else %}
       kibana_index: {{ client.server.index }}
+      {%- endif %}
 {%- endif %}
diff --git a/kibana/server.sls b/kibana/server.sls
index 570d582..a4aa181 100644
--- a/kibana/server.sls
+++ b/kibana/server.sls
@@ -17,13 +17,13 @@
 
 kibana_config:
   file.managed:
-  {%- if server.version == 5 %}
+  {%- if server.version in (5, 6) %}
   - name: /etc/kibana/kibana.yml
   {%- endif %}
   {%- if server.version == 4 %}
   - name: /opt/kibana/config/kibana.yml
   {%- endif %}
-  - source: salt://kibana/files/kibana.yml
+  - source: salt://kibana/files/v{{ server.version }}/kibana.yml
   - template: jinja
   - makedirs: true
   - require:
diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index cc1e5e1..35e4375 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -3,89 +3,89 @@
 parameters:
   _param:
     kibana_client_default_index: index-template-log
-    kibana_version: 5
   kibana:
     client:
       enabled: true
       default_index: ${_param:kibana_client_default_index}
+      version: ${_param:kibana_version}
       object:
         logs:
           enabled: true
-          template: kibana/files/objects/dashboard_logs.json
+          template: kibana/files/v${_param:kibana_version}/objects/dashboard_logs.json
           type: dashboard
         notifications:
           enabled: true
-          template: kibana/files/objects/dashboard_notifications.json
+          template: kibana/files/v${_param:kibana_version}/objects/dashboard_notifications.json
           type: dashboard
         index-template-log:
           enabled: true
-          template: kibana/files/objects/index-pattern_logs.json
+          template: kibana/files/v${_param:kibana_version}/objects/index-pattern_logs.json
           type: index-pattern
         index-template-notification:
           enabled: true
-          template: kibana/files/objects/index-pattern_notifications.json
+          template: kibana/files/v${_param:kibana_version}/objects/index-pattern_notifications.json
           type: index-pattern
         index-template-audit:
           enabled: true
-          template: kibana/files/objects/index-pattern_audit.json
+          template: kibana/files/v${_param:kibana_version}/objects/index-pattern_audit.json
           type: index-pattern
         search-logs:
           enabled: true
-          template: kibana/files/objects/search_logs.json
+          template: kibana/files/v${_param:kibana_version}/objects/search_logs.json
           type: search
         search-notifications:
           enabled: true
-          template: kibana/files/objects/search_notifications.json
+          template: kibana/files/v${_param:kibana_version}/objects/search_notifications.json
           type: search
         search-audit:
           enabled: true
-          template: kibana/files/objects/search_audit.json
+          template: kibana/files/v${_param:kibana_version}/objects/search_audit.json
           type: search
         LOG-MESSAGES-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
           type: visualization
         LOG-MESSAGES-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
           type: visualization
         NUMBER-OF-LOG-MESSAGES-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
           type: visualization
         TOP-10-HOSTS:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-HOSTS.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_TOP-10-HOSTS.json
           type: visualization
         TOP-10-PROGRAMS:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-PROGRAMS.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_TOP-10-PROGRAMS.json
           type: visualization
         TOP-10-SOURCES:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-SOURCES.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_TOP-10-SOURCES.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
           type: visualization
         EVENT-TYPE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_EVENT-TYPE-BREAKDOWN.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_EVENT-TYPE-BREAKDOWN.json
           type: visualization
         SOURCE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_SOURCE-BREAKDOWN.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_SOURCE-BREAKDOWN.json
           type: visualization
         HOST-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_HOST-BREAKDOWN.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_HOST-BREAKDOWN.json
           type: visualization
         NOTIFICATIONS-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
           type: visualization
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 5ec45fd..7dbc97d 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,8 +3,6 @@
 classes:
 - service.kibana.support
 parameters:
-  _param:
-    kibana_version: 5
   kibana:
     server:
       enabled: true
diff --git a/tests/pillar/kibana_client.sls b/tests/pillar/kibana_client.sls
index a4d7cb7..108a9aa 100644
--- a/tests/pillar/kibana_client.sls
+++ b/tests/pillar/kibana_client.sls
@@ -1,11 +1,12 @@
 kibana:
   client:
     enabled: true
+    version: 5
     default_index: 'log-*'
     object:
       logs:
         enabled: true
-        template: kibana/files/objects/dashboard_logs.json
+        template: kibana/files/v5/objects/dashboard_logs.json
         type: dashboard
       logs-directly:
         enabled: true
diff --git a/tests/pillar/kibana_debian_repo.sls b/tests/pillar/kibana_debian_repo.sls
index c2c1602..07f1657 100644
--- a/tests/pillar/kibana_debian_repo.sls
+++ b/tests/pillar/kibana_debian_repo.sls
@@ -3,6 +3,5 @@
     enabled: true
     repo:
       kibana_repo:
-        source: 'deb http://packages.elastic.co/kibana/4.1/debian stable main'
-        key_id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
-        key_server: hkp://p80.pool.sks-keyservers.net:80
\ No newline at end of file
+        source: "deb [arch=amd64] http://mirror.mirantis.com/testing/elasticsearch-5.x/{{ grains.get('oscodename') }} stable main"
+        key_url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
diff --git a/tests/pillar/kibana_server.sls b/tests/pillar/kibana_server.sls
index 83d7dc1..56242d9 100644
--- a/tests/pillar/kibana_server.sls
+++ b/tests/pillar/kibana_server.sls
@@ -1,6 +1,7 @@
 kibana:
   server:
     enabled: true
+    version: 5
     bind:
       address: 0.0.0.0
       port: 5601