From 08334973be3ef55d453986828deb2c2a4be5ed63 Mon Sep 17 00:00:00 2001
From: pemontto <pemontto@gmail.com>
Date: Wed, 17 Apr 2019 19:10:21 +1000
Subject: [PATCH] bring inline with master

---
 .gitignore                                            | 1 -
 Dockerfile                                            | 3 +--
 resources/elk6/pipeline/1000_nessus_process_file.conf | 2 --
 resources/elk6/pipeline/2000_qualys_web_scans.conf    | 2 --
 resources/elk6/pipeline/3000_openvas.conf             | 3 +--
 tests/test-vuln_whisperer.sh                          | 2 +-
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ca7c68..9fc0cb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # Vulnwhisperer stuff
 data/
-docker_data/
 logs/
 elk6/vulnwhisperer.ini
 resources/elk6/vulnwhisperer.ini
diff --git a/Dockerfile b/Dockerfile
index a2806ee..667cba1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,8 +20,7 @@ RUN python setup.py clean --all && \
 
 
 WORKDIR /opt/VulnWhisperer
-RUN python setup.py install && \   
-    ln -s /opt/VulnWhisperer /tmp/VulnWhisperer
+RUN python setup.py install
 
 
 CMD  vuln_whisperer -c /opt/VulnWhisperer/frameworks_example.ini
diff --git a/resources/elk6/pipeline/1000_nessus_process_file.conf b/resources/elk6/pipeline/1000_nessus_process_file.conf
index f22ade4..d300b93 100644
--- a/resources/elk6/pipeline/1000_nessus_process_file.conf
+++ b/resources/elk6/pipeline/1000_nessus_process_file.conf
@@ -47,8 +47,6 @@ filter {
       convert => { "cvss3" => "float"}
       convert => { "cvss3_base" => "float"}
       convert => { "cvss3_temporal" => "float"}
-      convert => { "id" => "integer"}
-      convert => { "plugin_id" => "integer"}
       convert => { "risk_number" => "integer"}
       convert => { "total_times_detected" => "integer"}
     }
diff --git a/resources/elk6/pipeline/2000_qualys_web_scans.conf b/resources/elk6/pipeline/2000_qualys_web_scans.conf
index 02fe101..145852c 100644
--- a/resources/elk6/pipeline/2000_qualys_web_scans.conf
+++ b/resources/elk6/pipeline/2000_qualys_web_scans.conf
@@ -43,8 +43,6 @@ filter {
       convert => { "cvss3" => "float"}
       convert => { "cvss3_base" => "float"}
       convert => { "cvss3_temporal" => "float"}
-      convert => { "id" => "integer"}
-      convert => { "plugin_id" => "integer"}
       convert => { "risk_number" => "integer"}
       convert => { "total_times_detected" => "integer"}
     }
diff --git a/resources/elk6/pipeline/3000_openvas.conf b/resources/elk6/pipeline/3000_openvas.conf
index 5a3b7d3..7017acd 100644
--- a/resources/elk6/pipeline/3000_openvas.conf
+++ b/resources/elk6/pipeline/3000_openvas.conf
@@ -31,6 +31,7 @@ filter {
         tag_on_failure => []
     }
 
+    # TODO - move this mapping into the vulnwhisperer module
     translate {
       field => "[risk_number]"
       destination => "[risk]"
@@ -100,8 +101,6 @@ filter {
       convert => { "cvss3" => "float"}
       convert => { "cvss3_base" => "float"}
       convert => { "cvss3_temporal" => "float"}
-      convert => { "id" => "integer"}
-      convert => { "plugin_id" => "integer"}
       convert => { "risk_number" => "integer"}
       convert => { "total_times_detected" => "integer"}
     }
diff --git a/tests/test-vuln_whisperer.sh b/tests/test-vuln_whisperer.sh
index 7739e8b..05d49f0 100755
--- a/tests/test-vuln_whisperer.sh
+++ b/tests/test-vuln_whisperer.sh
@@ -79,7 +79,7 @@ else
     ((return_code = return_code + 1))
 fi
 
-yellow "*********************************************"
+yellow "\n*********************************************"
 yellow "* Test only Qualys VM with one failed scan  *"
 yellow "*********************************************"
 rm -rf /opt/VulnWhisperer/*