diff --git a/kibana/files/objects/visualization_EVENT-TYPE-BREAKDOWN.json b/kibana/files/objects/v4/visualization_EVENT-TYPE-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/visualization_EVENT-TYPE-BREAKDOWN.json
rename to kibana/files/objects/v4/visualization_EVENT-TYPE-BREAKDOWN.json
diff --git a/kibana/files/objects/visualization_HOST-BREAKDOWN.json b/kibana/files/objects/v4/visualization_HOST-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/visualization_HOST-BREAKDOWN.json
rename to kibana/files/objects/v4/visualization_HOST-BREAKDOWN.json
diff --git a/kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json b/kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
rename to kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
diff --git a/kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json b/kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
similarity index 100%
rename from kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
rename to kibana/files/objects/v4/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
diff --git a/kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json b/kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
rename to kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
diff --git a/kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json b/kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
similarity index 100%
rename from kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
rename to kibana/files/objects/v4/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
diff --git a/kibana/files/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json b/kibana/files/objects/v4/visualization_NOTIFICATIONS-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
rename to kibana/files/objects/v4/visualization_NOTIFICATIONS-PER-SEVERITY.json
diff --git a/kibana/files/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json b/kibana/files/objects/v4/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
similarity index 100%
rename from kibana/files/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
rename to kibana/files/objects/v4/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
diff --git a/kibana/files/objects/visualization_SOURCE-BREAKDOWN.json b/kibana/files/objects/v4/visualization_SOURCE-BREAKDOWN.json
similarity index 100%
rename from kibana/files/objects/visualization_SOURCE-BREAKDOWN.json
rename to kibana/files/objects/v4/visualization_SOURCE-BREAKDOWN.json
diff --git a/kibana/files/objects/visualization_TOP-10-HOSTS.json b/kibana/files/objects/v4/visualization_TOP-10-HOSTS.json
similarity index 100%
rename from kibana/files/objects/visualization_TOP-10-HOSTS.json
rename to kibana/files/objects/v4/visualization_TOP-10-HOSTS.json
diff --git a/kibana/files/objects/visualization_TOP-10-PROGRAMS.json b/kibana/files/objects/v4/visualization_TOP-10-PROGRAMS.json
similarity index 100%
rename from kibana/files/objects/visualization_TOP-10-PROGRAMS.json
rename to kibana/files/objects/v4/visualization_TOP-10-PROGRAMS.json
diff --git a/kibana/files/objects/visualization_TOP-10-SOURCES.json b/kibana/files/objects/v4/visualization_TOP-10-SOURCES.json
similarity index 100%
rename from kibana/files/objects/visualization_TOP-10-SOURCES.json
rename to kibana/files/objects/v4/visualization_TOP-10-SOURCES.json
diff --git a/kibana/files/objects/v5/visualization_EVENT-TYPE-BREAKDOWN.json b/kibana/files/objects/v5/visualization_EVENT-TYPE-BREAKDOWN.json
new file mode 100644
index 0000000..9e6744b
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_EVENT-TYPE-BREAKDOWN.json
@@ -0,0 +1,10 @@
+{
+ "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\":\"notification-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+ }
+}
diff --git a/kibana/files/objects/v5/visualization_HOST-BREAKDOWN.json b/kibana/files/objects/v5/visualization_HOST-BREAKDOWN.json
new file mode 100644
index 0000000..354778e
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_HOST-BREAKDOWN.json
@@ -0,0 +1,10 @@
+{
+  "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\":\"notification-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json b/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
new file mode 100644
index 0000000..2c479ff
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
@@ -0,0 +1,10 @@
+{
+  "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\": \"log-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json b/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
new file mode 100644
index 0000000..fe162b6
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
@@ -0,0 +1,10 @@
+{
+ "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\": \"log-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+ }
+}
diff --git a/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json b/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
new file mode 100644
index 0000000..609b56b
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
@@ -0,0 +1,10 @@
+{
+  "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\":\"notification-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json b/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
new file mode 100644
index 0000000..5fcd6fc
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
@@ -0,0 +1,10 @@
+{
+  "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\": \"notification-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_NOTIFICATIONS-PER-SEVERITY.json b/kibana/files/objects/v5/visualization_NOTIFICATIONS-PER-SEVERITY.json
new file mode 100644
index 0000000..9366b51
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_NOTIFICATIONS-PER-SEVERITY.json
@@ -0,0 +1,10 @@
+{
+  "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\": \"notification-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json b/kibana/files/objects/v5/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
new file mode 100644
index 0000000..be7f22f
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
@@ -0,0 +1,10 @@
+{
+  "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\":\"log-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_SOURCE-BREAKDOWN.json b/kibana/files/objects/v5/visualization_SOURCE-BREAKDOWN.json
new file mode 100644
index 0000000..d4f37cf
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_SOURCE-BREAKDOWN.json
@@ -0,0 +1,10 @@
+{
+  "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\":\"notification-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_TOP-10-HOSTS.json b/kibana/files/objects/v5/visualization_TOP-10-HOSTS.json
new file mode 100644
index 0000000..417b4e9
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_TOP-10-HOSTS.json
@@ -0,0 +1,10 @@
+{
+  "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\": \"log-*\",\n  \"query\": {\n    \"query_string\": {\n      \"analyze_wildcard\": true,\n      \"query\": \"*\"\n    }\n  },\n  \"filter\": []\n}"
+  }
+}
diff --git a/kibana/files/objects/v5/visualization_TOP-10-PROGRAMS.json b/kibana/files/objects/v5/visualization_TOP-10-PROGRAMS.json
new file mode 100644
index 0000000..a5850d1
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_TOP-10-PROGRAMS.json
@@ -0,0 +1,10 @@
+{
+ "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\": \"log-*\",\n  \"query\": {\n    \"query_string\": {\n      \"analyze_wildcard\": true,\n      \"query\": \"*\"\n    }\n  },\n  \"filter\": []\n}"
+ }
+}
diff --git a/kibana/files/objects/v5/visualization_TOP-10-SOURCES.json b/kibana/files/objects/v5/visualization_TOP-10-SOURCES.json
new file mode 100644
index 0000000..00b23e5
--- /dev/null
+++ b/kibana/files/objects/v5/visualization_TOP-10-SOURCES.json
@@ -0,0 +1,10 @@
+{
+ "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\":\"log-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"
+ }
+}
diff --git a/kibana/map.jinja b/kibana/map.jinja
index 93852ec..bf829c1 100644
--- a/kibana/map.jinja
+++ b/kibana/map.jinja
@@ -1,12 +1,14 @@
+{%- load_yaml as base_defaults %}
+Debian:
+  pkgs:
+  - kibana
+  service: kibana
+  default_app_id: discover
+default:
+  version: 4
+{%- endload %}
 
-{% set server = salt['grains.filter_by']({
-    'Debian': {
-        'pkgname': 'kibana',
-        'service': 'kibana',
-        'configpath': '/opt/kibana/config/kibana.yml',
-        'default_app_id': 'discover',
-    },
-}, merge=salt['pillar.get']('kibana:server')) %}
+{% set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('kibana:server'), base='default') %}
 
 {% set monitoring = salt['grains.filter_by']({
     'default': {
diff --git a/kibana/server.sls b/kibana/server.sls
index 09eb896..570d582 100644
--- a/kibana/server.sls
+++ b/kibana/server.sls
@@ -1,9 +1,9 @@
 {%- from "kibana/map.jinja" import server with context %}
 {%- if server.enabled %}
 
-kibana_package:
+kibana_packages:
   pkg.installed:
-    - name: {{ server.pkgname }}
+    - names: {{ server.pkgs }}
 
 kibana_service:
   service.running:
@@ -13,15 +13,21 @@
   - onlyif: /bin/false
   {%- endif %}
   - watch:
-    - file: {{ server.configpath }}
+    - file: kibana_config
 
-{{ server.configpath }}:
+kibana_config:
   file.managed:
+  {%- if server.version == 5 %}
+  - name: /etc/kibana/kibana.yml
+  {%- endif %}
+  {%- if server.version == 4 %}
+  - name: /opt/kibana/config/kibana.yml
+  {%- endif %}
   - source: salt://kibana/files/kibana.yml
   - template: jinja
   - makedirs: true
   - require:
-    - pkg: kibana_package
+    - pkg: kibana_packages
 
 {%- endif %}
 
diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 5fef9d9..4abf671 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -3,6 +3,7 @@
 parameters:
   _param:
     kibana_client_default_index: "log-*"
+    kibana_version: 4
   kibana:
     client:
       enabled: true
@@ -42,49 +43,49 @@
           type: search
         LOG-MESSAGES-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
           type: visualization
         LOG-MESSAGES-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
           type: visualization
         NUMBER-OF-LOG-MESSAGES-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
           type: visualization
         TOP-10-HOSTS:
           enabled: true
-          template: kibana/files/objects/visualization_TOP-10-HOSTS.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-HOSTS.json
           type: visualization
         TOP-10-PROGRAMS:
           enabled: true
-          template: kibana/files/objects/visualization_TOP-10-PROGRAMS.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-PROGRAMS.json
           type: visualization
         TOP-10-SOURCES:
           enabled: true
-          template: kibana/files/objects/visualization_TOP-10-SOURCES.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-SOURCES.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
           type: visualization
         EVENT-TYPE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/visualization_EVENT-TYPE-BREAKDOWN.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_EVENT-TYPE-BREAKDOWN.json
           type: visualization
         SOURCE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/visualization_SOURCE-BREAKDOWN.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_SOURCE-BREAKDOWN.json
           type: visualization
         HOST-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/visualization_HOST-BREAKDOWN.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_HOST-BREAKDOWN.json
           type: visualization
         NOTIFICATIONS-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-PER-SEVERITY.json
           type: visualization
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 3ca67fc..561bec0 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,10 +3,12 @@
 classes:
 - service.kibana.support
 parameters:
+  _param:
+    kibana_version: 4
   kibana:
     server:
       enabled: true
-      version: latest
+      version: ${_param:kibana_version}
       source:
         engine: file
       bind:
diff --git a/tests/pillar/kibana_server.sls b/tests/pillar/kibana_server.sls
index 115494c..83d7dc1 100644
--- a/tests/pillar/kibana_server.sls
+++ b/tests/pillar/kibana_server.sls
@@ -1,6 +1,5 @@
 kibana:
   server:
-    configpath: /usr/share/kibana/config/kibana.yml
     enabled: true
     bind:
       address: 0.0.0.0