diff --git a/logstash/config/30-elasticsearch-output.conf b/logstash/config/30-elasticsearch-output.conf
new file mode 100644
index 0000000000000000000000000000000000000000..7e853dbc044412bacda844f8c0e3a8f7dee46c26
--- /dev/null
+++ b/logstash/config/30-elasticsearch-output.conf
@@ -0,0 +1,16 @@
+output {
+  if [@metadata][pipeline] {
+    elasticsearch {
+    hosts => ["localhost:9200"]
+    manage_template => false
+    index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+    pipeline => "%{[@metadata][pipeline]}"
+    }
+  } else {
+    elasticsearch {
+    hosts => ["localhost:9200"]
+    manage_template => false
+    index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+    }
+  }
+}