Commit Graph

12 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
1d92f71f9c fix issue mentioned in #163, although not applied to ELK6 2019-04-15 17:06:09 +02:00
603050e7b3 cherry pick #0227636 2019-04-12 18:04:19 +10:00
0227636c4c unify case among config 2019-04-12 17:54:17 +10:00
496fd23121 Remove nessus csv completely 2019-04-11 22:22:58 +10:00
0710b38de3 Update nessus logstash configs 2019-04-11 20:27:54 +10:00
7240fd9028 Add qualys paths to elk5 logstash config 2019-04-11 10:43:05 +10:00
db0d7a0491 Fix nessus logstash field cvss3_vector 2019-04-11 10:43:05 +10:00
8dc3b2f8ac Add qualys paths to elk5 logstash config 2019-04-11 10:41:13 +10:00
d2a7513ed1 Fix nessus logstash field cvss3_vector 2019-04-11 10:36:41 +10:00
bdbe31d425 resources reorg 2 2019-02-25 12:29:00 +01:00
f170dcb05f reorg resources files 2019-02-25 12:27:30 +01:00