diff --git a/logstash/tasks/main.yml b/logstash/tasks/main.yml
index f8d39a79..fcaef9bb 100644
--- a/logstash/tasks/main.yml
+++ b/logstash/tasks/main.yml
@@ -39,3 +39,19 @@
     line: "-Xmx{{ logstash_jvm_xmx }}"
   tags:
     - config
+
+- name: Add a configuration
+  template:
+    src: "{{ item }}"
+    dest: /etc/logstash/conf.d/logstash.conf
+    force: yes
+  with_first_found:
+  - "templates/logstash/logstash.{{ inventory_hostname }}.conf.j2"
+  - "templates/logstash/logstash.{{ host_group }}.conf.j2"
+  - "templates/logstash/logstash.default.conf.j2"
+  - "logstash.default.conf.j2"
+  register: logstash_template
+
+- debug:
+    var: logstash_template
+    verbosity: 1
diff --git a/logstash/templates/logstash.default.conf.j2 b/logstash/templates/logstash.default.conf.j2
new file mode 100644
index 00000000..293de264
--- /dev/null
+++ b/logstash/templates/logstash.default.conf.j2
@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+
+# In this file you can put a Logstash pipeline configuration