Commit Graph

9 Commits

Author SHA1 Message Date
e8d0c71bfb Merge branch 'docker-fixes' into feature-nessus-json-latest
* 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
2019-04-17 15:40:19 +10:00
e0de8c6818 Expose Logstash API port 2019-04-17 14:50:06 +10:00
d9ab33d6c9 Set logstash and vw to use the same volume 2019-04-16 11:18:27 +10:00
74ebf43492 Add snapshots and latest build 2019-04-15 20:09:50 +10:00
00f9b7659b Docker install ES index template 2019-04-15 18:17:43 +10:00
29a91cbfb2 Simplify pandas operations, update transforms 2019-04-15 17:05:21 +10:00
603050e7b3 cherry pick #0227636 2019-04-12 18:04:19 +10:00
bf5070f361 fix vulnwhisperer image 2019-04-12 17:55:59 +10:00
0227636c4c unify case among config 2019-04-12 17:54:17 +10:00