* docker-fixes: (33 commits)
fix test output
set default path and fix restore
Set limit to bail out on
increase timeout for ES sync
restore deleted files
Test updates
Move vulnwhisperer tests to a script
standardise /tmp to /opt
Update test
Add docker test script
Expose Logstash API port
sudo chown
fix
Fix permissions for ES
Fix build command
Test travis docker
update kibana objects to match template
update index template
Retry template installation a few times
Add initial ELK6 index template
...
# Conflicts:
# .travis.yml
# configs/test.ini
# docker-compose-test.yml
# docker-compose.v6.yml
# resources/elk5-old_compatibility/logstash/1000_nessus_process_file.conf
# resources/elk6/init_kibana.sh
# resources/elk6/pipeline/1000_nessus_process_file.conf
# resources/elk6/pipeline/2000_qualys_web_scans.conf
# resources/elk6/pipeline/3000_openvas.conf
e8d0c71bfb