diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3a13363
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dashboard-importer"]
+	path = dashboard-importer
+	url = https://github.com/GerritForge/analytics-dashboard-importer.git
diff --git a/dashboard-importer b/dashboard-importer
new file mode 160000
index 0000000..b0a57fc
--- /dev/null
+++ b/dashboard-importer
@@ -0,0 +1 @@
+Subproject commit b0a57fcaf51a0539bfbf6bac2b806f323e412f48
diff --git a/dashboard-importer/Dockerfile b/dashboard-importer/Dockerfile
deleted file mode 100644
index 4aa6a13..0000000
--- a/dashboard-importer/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM taskrabbit/elasticsearch-dump:v3.3.1
-
-RUN apk add --no-cache curl
-
-COPY docker-entrypoint.sh wait-for-elasticsearch ./kibana-config /
-
-ENTRYPOINT /docker-entrypoint.sh
diff --git a/dashboard-importer/credentials.env b/dashboard-importer/credentials.env
deleted file mode 100644
index 02177e6..0000000
--- a/dashboard-importer/credentials.env
+++ /dev/null
@@ -1,2 +0,0 @@
-ES_USER=elastic
-ES_PWD=changeme
diff --git a/dashboard-importer/docker-entrypoint.sh b/dashboard-importer/docker-entrypoint.sh
deleted file mode 100755
index 9318f83..0000000
--- a/dashboard-importer/docker-entrypoint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-/wait-for-elasticsearch
-
-echo "** Creating Gerrit index"
-curl -XPUT "http://elasticsearch:9200/gerrit?pretty" -H 'Content-Type: application/json'
-
-echo "** Importing Kibana setting from: "
-for file in `ls -v /*.json`;
-    do  echo "--> $file";
-        /usr/lib/node_modules/elasticdump/bin/elasticdump \
-        --output=http://elasticsearch:9200/.kibana \
-        --input=$file \
-        --type=data \
-        --headers '{"Content-Type": "application/json"}';
-done;
diff --git a/dashboard-importer/kibana-config/1_config.json b/dashboard-importer/kibana-config/1_config.json
deleted file mode 100644
index cc5f7a8..0000000
--- a/dashboard-importer/kibana-config/1_config.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "_index": ".kibana",
-  "_type": "config",
-  "_id": "5.5.2",
-  "_score": 1,
-  "_source": {
-    "buildNum": 15443,
-    "xPackMonitoring:allowReport": true,
-    "xPackMonitoring:showBanner": true,
-    "defaultIndex": "gerrit"
-  }
-}
diff --git a/dashboard-importer/kibana-config/2_index-pattern.json b/dashboard-importer/kibana-config/2_index-pattern.json
deleted file mode 100644
index ec04ebf..0000000
--- a/dashboard-importer/kibana-config/2_index-pattern.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "_index": ".kibana",
-  "_type": "index-pattern",
-  "_id": "gerrit",
-  "_score": 1,
-  "_source": {
-    "title": "gerrit",
-    "timeFieldName": "last_commit_date",
-    "notExpandable": true,
-    "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"added_lines\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"author\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"author.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"deleted_lines\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"email\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"email.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"email_alias\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"email_alias.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"hour\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"last_commit_date\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"month\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"num_commits\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"is_merge\",\"type\":\"boolean\",\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"num_files\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"num_distinct_files\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"organization\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"organization.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"project\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"project.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"year\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"changes_per_commit\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"if (doc['num_commits'].value > 0) { \\n    return ((float) (doc['added_lines'].value + doc['deleted_lines'].value) / (float) doc['num_commits'].value);\\n} else {\\n    return 0;\\n}\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]"
-  }
-}
\ No newline at end of file
diff --git a/dashboard-importer/kibana-config/3_visualization_authors-activity-heatmap.json b/dashboard-importer/kibana-config/3_visualization_authors-activity-heatmap.json
deleted file mode 100644
index 47f5f62..0000000
--- a/dashboard-importer/kibana-config/3_visualization_authors-activity-heatmap.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"_id": "208c4da0-d9c5-11e7-bc47-b39f13297094",
-	"_type": "visualization",
-	"_source": {
-		"title": "Authors activity over years heatmap",
-		"visState": "{\"title\":\"Authors activity over years heatmap\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":10,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":true,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":true},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"num_commits\",\"customLabel\":\"#Commits\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"last_commit_date\",\"interval\":\"y\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"author.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Author\"}}],\"listeners\":{}}",
-		"uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0% - 10%\":\"rgb(255,255,204)\",\"10% - 20%\":\"rgb(255,241,170)\",\"20% - 30%\":\"rgb(254,225,135)\",\"30% - 40%\":\"rgb(254,201,101)\",\"40% - 50%\":\"rgb(254,171,73)\",\"50% - 60%\":\"rgb(253,141,60)\",\"60% - 70%\":\"rgb(252,91,46)\",\"70% - 80%\":\"rgb(237,47,34)\",\"80% - 90%\":\"rgb(212,16,32)\",\"90% - 100%\":\"rgb(176,0,38)\"}}}",
-		"description": "",
-		"version": 1,
-		"kibanaSavedObjectMeta": {
-			"searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-		}
-	}
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_authors-stats.json b/dashboard-importer/kibana-config/3_visualization_authors-stats.json
deleted file mode 100644
index 343dd69..0000000
--- a/dashboard-importer/kibana-config/3_visualization_authors-stats.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"_id": "1b513980-d9b7-11e7-bc47-b39f13297094",
-	"_type": "visualization",
-	"_source": {
-		"title": "Author's stats",
-		"visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"#Projects\",\"field\":\"project.keyword\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Author\",\"field\":\"author.keyword\",\"order\":\"desc\",\"orderBy\":\"3\",\"size\":20},\"schema\":\"bucket\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"#Commits\",\"field\":\"num_commits\"},\"schema\":\"metric\",\"type\":\"sum\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"#Avg num files\",\"field\":\"num_files\"},\"schema\":\"metric\",\"type\":\"avg\"},{\"enabled\":true,\"id\":\"5\",\"params\":{\"customLabel\":\"#Added lines\",\"field\":\"added_lines\"},\"schema\":\"metric\",\"type\":\"sum\"},{\"enabled\":true,\"id\":\"6\",\"params\":{\"customLabel\":\"#Deleted lines\",\"field\":\"deleted_lines\"},\"schema\":\"metric\",\"type\":\"sum\"},{\"enabled\":true,\"id\":\"7\",\"params\":{\"customLabel\":\"AVG changes per commit\",\"field\":\"changes_per_commit\"},\"schema\":\"metric\",\"type\":\"avg\"}],\"listeners\":{},\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"title\":\"Author's stats\",\"type\":\"table\"}",
-		"uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}",
-		"description": "",
-		"version": 1,
-		"kibanaSavedObjectMeta": {
-			"searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-		}
-	}
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_commits-per-author.json b/dashboard-importer/kibana-config/3_visualization_commits-per-author.json
deleted file mode 100644
index 47d70cc..0000000
--- a/dashboard-importer/kibana-config/3_visualization_commits-per-author.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-"_id": "63c8f590-d9b2-11e7-bc06-5dd1310bbecc",
-"_type": "visualization",
-"_source": {
-"title": "Commits per author",
-"visState": "{\"title\":\"Commits per author\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"num_commits\",\"customLabel\":\"#Commits\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"author.keyword\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-"uiStateJSON": "{}",
-"description": "",
-"version": 1,
-"kibanaSavedObjectMeta": {
-"searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-}
-}
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_commits-per-day.json b/dashboard-importer/kibana-config/3_visualization_commits-per-day.json
deleted file mode 100644
index 1a97c9d..0000000
--- a/dashboard-importer/kibana-config/3_visualization_commits-per-day.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "_id": "cc5678a0-d9b0-11e7-bc06-5dd1310bbecc",
-    "_type": "visualization",
-    "_source": {
-        "title": "Commits per day",
-        "visState": "{\"title\":\"Commits per day\",\"type\":\"histogram\",\"params\":{\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100},\"title\":{\"text\":\"Commit day\"}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"author\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"#commits\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"histogram\",\"mode\":\"stacked\",\"data\":{\"label\":\"#commits\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"num_commits\",\"customLabel\":\"#commits\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"last_commit_date\",\"interval\":\"d\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Commit day\"}}],\"listeners\":{}}",
-        "uiStateJSON": "{}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-            "searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-        }
-    }
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_commits-per-organization.json b/dashboard-importer/kibana-config/3_visualization_commits-per-organization.json
deleted file mode 100644
index 35120ef..0000000
--- a/dashboard-importer/kibana-config/3_visualization_commits-per-organization.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "_id": "0f78a3a0-d9b2-11e7-bc06-5dd1310bbecc",
-    "_type": "visualization",
-    "_source": {
-        "title": "Commits per organization",
-        "visState": "{\"title\":\"Commits per organization\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"num_commits\",\"customLabel\":\"#Commits\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"organization.keyword\",\"size\":30,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-        "uiStateJSON": "{}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-            "searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-        }
-    }
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_merge-vs-non-merge-commits.json b/dashboard-importer/kibana-config/3_visualization_merge-vs-non-merge-commits.json
deleted file mode 100644
index a5ef04b..0000000
--- a/dashboard-importer/kibana-config/3_visualization_merge-vs-non-merge-commits.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-"_id": "6a0b5b60-d1e8-42cc-9934-16673b657934",
-"_type": "visualization",
-"_source": {
-"title": "Merge vs Non-Merge commits",
-"visState": "{\"title\":\"Commits per type\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"num_commits\",\"customLabel\":\"#Commits\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"is_merge\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-"uiStateJSON": "{}",
-"description": "",
-"version": 1,
-"kibanaSavedObjectMeta": {
-"searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-}
-}
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_organization-stats.json b/dashboard-importer/kibana-config/3_visualization_organization-stats.json
deleted file mode 100644
index 6822f1c..0000000
--- a/dashboard-importer/kibana-config/3_visualization_organization-stats.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"_id": "176b0730-d9ce-11e7-bc47-b39f13297094",
-	"_type": "visualization",
-	"_source": {
-		"title": "Organisation's stats",
-		"visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"#Authors\",\"field\":\"author.keyword\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"#Projects\",\"field\":\"project.keyword\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"#Commits\",\"field\":\"num_commits\"},\"schema\":\"metric\",\"type\":\"sum\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"field\":\"added_lines\"},\"schema\":\"metric\",\"type\":\"sum\"},{\"enabled\":true,\"id\":\"5\",\"params\":{\"field\":\"deleted_lines\"},\"schema\":\"metric\",\"type\":\"sum\"},{\"enabled\":true,\"id\":\"6\",\"params\":{\"customLabel\":\"AVG num files\",\"field\":\"num_files\"},\"schema\":\"metric\",\"type\":\"avg\"},{\"enabled\":true,\"id\":\"7\",\"params\":{\"customLabel\":\"AVG changes per commit\",\"field\":\"changes_per_commit\"},\"schema\":\"metric\",\"type\":\"avg\"},{\"enabled\":true,\"id\":\"8\",\"params\":{\"field\":\"organization.keyword\",\"order\":\"desc\",\"orderBy\":\"3\",\"size\":30},\"schema\":\"bucket\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"title\":\"Organisation's stats\",\"type\":\"table\"}",
-		"uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-		"description": "",
-		"version": 1,
-		"kibanaSavedObjectMeta": {
-			"searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-		}
-	}
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_overall-statistics.json b/dashboard-importer/kibana-config/3_visualization_overall-statistics.json
deleted file mode 100644
index e01c4d0..0000000
--- a/dashboard-importer/kibana-config/3_visualization_overall-statistics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "_id": "0d0d5ae0-d9b0-11e7-bc06-5dd1310bbecc",
-    "_type": "visualization",
-    "_source": {
-        "title": "Overall statistics",
-        "visState": "{\"title\":\"Overall statistics\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"fontSize\":60,\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"project.keyword\",\"customLabel\":\"#Projects\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"author.keyword\",\"customLabel\":\"#Authors\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"organization.keyword\",\"customLabel\":\"#Organizations\"}}],\"listeners\":{}}",
-        "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-            "searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-        }
-    }
-}
diff --git a/dashboard-importer/kibana-config/3_visualization_projects-stats.json b/dashboard-importer/kibana-config/3_visualization_projects-stats.json
deleted file mode 100644
index e075e7d..0000000
--- a/dashboard-importer/kibana-config/3_visualization_projects-stats.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"_id": "67c28b30-d9cf-11e7-bc47-b39f13297094",
-	"_type": "visualization",
-	"_source": {
-		"title": "Projects' stats",
-			"visState": "{\"title\":\"Projects' stats\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"author.keyword\",\"customLabel\":\"#Authors\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"organization.keyword\",\"customLabel\":\"#Organistaions\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"num_commits\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"added_lines\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"deleted_lines\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"num_files\",\"customLabel\":\"AVG num files\"}},{\"id\":\"7\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"changes_per_commit\",\"customLabel\":\"AVG changes per commit\"}},{\"id\":\"8\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"project.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"3\"}}],\"listeners\":{}}",
-			"uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-			"description": "",
-			"version": 1,
-			"kibanaSavedObjectMeta": {
-				"searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"match_all\":{}},\"filter\":[]}"
-			}
-	}
-}
diff --git a/dashboard-importer/kibana-config/4_dashboard_projects.json b/dashboard-importer/kibana-config/4_dashboard_projects.json
deleted file mode 100644
index 99c538d..0000000
--- a/dashboard-importer/kibana-config/4_dashboard_projects.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "_id": "11bacbf0-e4a9-11e7-b91f-5fb563b02e79",
-  "_type": "dashboard",
-  "_source": {
-    "title": "Projects dashboard",
-    "hits": 0,
-    "description": "",
-    "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"6a0b5b60-d1e8-42cc-9934-16673b657934\",\"col\":1,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"63c8f590-d9b2-11e7-bc06-5dd1310bbecc\",\"col\":7,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"cc5678a0-d9b0-11e7-bc06-5dd1310bbecc\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"0f78a3a0-d9b2-11e7-bc06-5dd1310bbecc\",\"col\":7,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"176b0730-d9ce-11e7-bc47-b39f13297094\",\"col\":1,\"row\":7},{\"size_x\":6,\"size_y\":3,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"1b513980-d9b7-11e7-bc47-b39f13297094\",\"col\":7,\"row\":7},{\"size_x\":6,\"size_y\":3,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"67c28b30-d9cf-11e7-bc47-b39f13297094\",\"col\":1,\"row\":10},{\"size_x\":6,\"size_y\":3,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"208c4da0-d9c5-11e7-bc47-b39f13297094\",\"col\":7,\"row\":10}]",
-    "optionsJSON": "{\"darkTheme\":false}",
-    "uiStateJSON": "{\"P-1\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-6\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}},\"P-7\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"defaultColors\":{\"0% - 10%\":\"rgb(255,255,204)\",\"10% - 20%\":\"rgb(255,241,170)\",\"20% - 30%\":\"rgb(254,225,135)\",\"30% - 40%\":\"rgb(254,201,101)\",\"40% - 50%\":\"rgb(254,171,73)\",\"50% - 60%\":\"rgb(253,141,60)\",\"60% - 70%\":\"rgb(252,91,46)\",\"70% - 80%\":\"rgb(237,47,34)\",\"80% - 90%\":\"rgb(212,16,32)\",\"90% - 100%\":\"rgb(176,0,38)\"}}}}",
-    "version": 1,
-    "timeRestore": false,
-    "kibanaSavedObjectMeta": {
-      "searchSourceJSON": "{\"filter\":[{\"query\":{\"match_all\":{}}}],\"highlightAll\":true,\"version\":true}"
-    }
-  }
-}
diff --git a/dashboard-importer/wait-for-elasticsearch b/dashboard-importer/wait-for-elasticsearch
deleted file mode 100755
index fddba5e..0000000
--- a/dashboard-importer/wait-for-elasticsearch
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-wait_for() {
-  for i in `seq 30` ; do
-    curl -f http://elasticsearch:9200/_cluster/health > /dev/null 2>&1
-
-    result=$?
-    if [ $result -eq 0 ] ; then
-      if [ $# -gt 0 ] ; then
-        exec "$@"
-      fi
-      exit 0
-    fi
-    echo "* Waiting for Elasticsearch ($i/30)"
-    sleep 2
-  done
-  echo "Operation timed out" >&2
-  exit 1
-}
-
-wait_for "$@"