diff --git a/backend/build.gradle b/backend/build.gradle
index 0eaa28486e413..e9ec45cd09bc0 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -28,7 +28,6 @@ dependencies {
   compile "ch.qos.logback:logback-classic:$logbackVersion"
   compile "ch.qos.logback:logback-core:$logbackVersion"
   compile "ch.qos.logback:logback-access:$logbackVersion"
-  compile "org.slf4j:slf4j-api:$slf4jVersion"
 
   compile "com.google.protobuf:protobuf-java-util:$protocVersion"
   compile "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
diff --git a/config/beats/config/metricbeat.yml b/config/beats/config/metricbeat.yml
new file mode 100644
index 0000000000000..7d7fd667b784b
--- /dev/null
+++ b/config/beats/config/metricbeat.yml
@@ -0,0 +1,18 @@
+metricbeat.modules:
+- module: system
+  metricsets:
+    - cpu
+    - filesystem
+    - memory
+    - network
+    - process
+  enabled: true
+  period: 10s
+  processes: ['.*']
+  cpu_ticks: false
+
+output.elasticsearch:
+  hosts: [ "docker.for.mac.localhost:9201" ]
+
+setup.kibana:
+  host: "docker.for.mac.localhost:5601"
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c7866a2c48a55..1c8920ac8f07f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,4 +22,17 @@ services:
       LS_JAVA_OPTS: "-Xmx256m -Xms256m"
     depends_on:
       - elasticsearch
+    restart: on-failure
+
+  metricbeat:
+    image: 'elastic/metricbeat:6.3.0'
+    volumes:
+      - ./config/beats/config/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml
+      - /proc:/hostfs/proc:ro
+      - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
+      - /:/hostfs:ro
+    command:
+      - "-system.hostfs=/hostfs"
+    depends_on:
+      - elasticsearch
     restart: on-failure
\ No newline at end of file
diff --git a/kibana-extra/castro/build.gradle b/kibana-extra/castro/build.gradle
index 04420ea43cfef..3f3b57bcda3ac 100644
--- a/kibana-extra/castro/build.gradle
+++ b/kibana-extra/castro/build.gradle
@@ -28,7 +28,7 @@ task bootstrap(type: YarnTask, dependsOn: [yarn]) {
 }
 
 task startKibana(type: YarnTask, dependsOn: [yarn, generateProto]) {
-  args = ['start', '--elasticsearch.url', 'http://localhost:9201']
+  args = ['start', '--elasticsearch.url', 'http://localhost:9201', '--no-base-path']
 }
 
 task downloadKibana(type: Download) {