diff --git a/roles/collect-logs/defaults/main.yml b/roles/collect-logs/defaults/main.yml
index 11ad860b6..73de75a64 100644
--- a/roles/collect-logs/defaults/main.yml
+++ b/roles/collect-logs/defaults/main.yml
@@ -77,3 +77,31 @@ artcl_create_docs_payload:
 artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/source"
 artcl_docs_build_dir: "{{ artcl_collect_dir }}/docs/build"
 artcl_verify_sphinx_build: false
+artcl_logstash_files:
+  - /home/*/deployed_server_prepare.txt
+  - /home/*/docker_journalctl.log
+  - /home/*/failed_deployment_list.log
+  - /home/*/hostname.sh.log
+  - /home/*/install_built_repo.log
+  - /home/*/install_packages.sh.log
+  - /home/*/ironic-python-agent.log
+  - /home/*/overcloud_create_ssl_cert.log
+  - /home/*/overcloud_custom_tht_script.log
+  - /home/*/overcloud_delete.log
+  - /home/*/overcloud_deploy.log
+  - /home/*/overcloud_deploy_post.log
+  - /home/*/overcloud-full.log
+  - /home/*/overcloud_image_build.log
+  - /home/*/overcloud_prep_containers.log
+  - /home/*/overcloud_prep_images.log
+  - /home/*/overcloud_prep_network.log
+  - /home/*/overcloud_upgrade_console.log
+  - /home/*/overcloud_validate.log
+  - /home/*/repo_setup.log
+  - /home/*/repo_setup.sh.*.log
+  - /home/*/undercloud_install.log
+  - /home/*/undercloud_reinstall.log
+  - /home/*/upgrade-undercloud-repo.sh.log
+  - /home/*/vxlan_networking.sh.log
+  - /home/*/yum_mirror_error.log
+  - /home/*/yum_mirror.log
diff --git a/roles/collect-logs/tasks/collect.yml b/roles/collect-logs/tasks/collect.yml
index 62152e5a8..66a684ad2 100644
--- a/roles/collect-logs/tasks/collect.yml
+++ b/roles/collect-logs/tasks/collect.yml
@@ -187,6 +187,11 @@
     - name: Collect text version of the journal from last four hours
       shell: journalctl --since=-4h --lines=100000 > /var/log/journal.txt
 
+    - name: Create a index file for logstash
+      shell: >
+        for i in {{ artcl_logstash_files|default([])|join(" ") }}; do
+        cat $i; done | grep "^20.*|" | sort -sk1,2 > /var/log/extra/logstash.txt
+
     # Collect host info as done presently in TripleO-CI.
     # Will be deprecated.
     - name: Create get_host_info script