diff --git a/docker-compose/elk/logstash/conf.d/20-parse-grafana.conf b/docker-compose/elk/logstash/conf.d/20-parse-grafana.conf
new file mode 100644
index 0000000000000000000000000000000000000000..37db44fda67109d7ef8a6beac1193004968a2349
--- /dev/null
+++ b/docker-compose/elk/logstash/conf.d/20-parse-grafana.conf
@@ -0,0 +1,16 @@
+filter {
+  if [program] == "grafana" {
+    kv { }
+    mutate {
+      rename => {
+        "t" => "timestamp"
+        "lvl" => "level"
+        "msg" => "message"
+      }
+      uppercase => [ "level" ]
+    }
+    date {
+      match => [ "timestamp", "ISO8601" ]
+    }
+  }
+}
diff --git a/docker-compose/elk/logstash/conf.d/21-parse-prometheus.conf b/docker-compose/elk/logstash/conf.d/21-parse-prometheus.conf
new file mode 100644
index 0000000000000000000000000000000000000000..b8323625f329af02f9ff33556e408b94ecf7e0b6
--- /dev/null
+++ b/docker-compose/elk/logstash/conf.d/21-parse-prometheus.conf
@@ -0,0 +1,15 @@
+filter {
+  if [program] == "prometheus" {
+    kv { }
+    mutate {
+      rename => {
+        "ts" => "timestamp"
+        "msg" => "message"
+      }
+      uppercase => [ "level" ]
+    }
+    date {
+      match => [ "timestamp", "ISO8601" ]
+    }
+  }
+}
diff --git a/docker-compose/grafana.yml b/docker-compose/grafana.yml
index b9060c70a53ecfb4d4027ebe1e78d9fe658050f6..eaddea1e290f554e9ad568b0cef632017d3a04ca 100644
--- a/docker-compose/grafana.yml
+++ b/docker-compose/grafana.yml
@@ -23,4 +23,10 @@ services:
     #  - grafana-configs:/etc/grafana
     ports:
       - "3000:3000"
+    logging:
+      driver: syslog
+      options:
+        syslog-address: udp://${HOSTNAME}:1514
+        syslog-format: rfc3164
+        tag: "{{.Name}}"
     restart: unless-stopped
diff --git a/docker-compose/prometheus.yml b/docker-compose/prometheus.yml
index a0971c48fde4551809a936594aadcb6a79076712..abec3c84e5e86abc0e5a00dbbbdcb99b05e7daf8 100644
--- a/docker-compose/prometheus.yml
+++ b/docker-compose/prometheus.yml
@@ -16,4 +16,10 @@ services:
       - control
     ports:
       - "9090:9090"
+    logging:
+      driver: syslog
+      options:
+        syslog-address: udp://${HOSTNAME}:1514
+        syslog-format: rfc3164
+        tag: "{{.Name}}"
     restart: unless-stopped