From 3ccf28617ee1ad3a2f906d3cad5e3151d1d274bb Mon Sep 17 00:00:00 2001
From: neonbunny <neonbunny@users.noreply.github.com>
Date: Fri, 22 Sep 2017 11:22:59 +0100
Subject: [PATCH 1/2] Clarify warning message

A previous change replaced a comma in the message with the word "but" which is incorrect - the missing KMS key was the indicator that the trail was not encrypted.
---
 prowler | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prowler b/prowler
index c321ca55..bb460856 100755
--- a/prowler
+++ b/prowler
@@ -978,7 +978,7 @@ check27(){
         if [[ $CLOUDTRAILENC_ENABLED ]];then
           textOK "KMS key found for $trail"
         else
-          textWarn "encryption is not enabled in your CloudTrail trail $trail but KMS key not found!"
+          textWarn "encryption is not enabled in your CloudTrail trail $trail (KMS key not found)!"
         fi
       done
     else

From 1df55ebf6079d946e2d34873b03f18a530e82542 Mon Sep 17 00:00:00 2001
From: neonbunny <neonbunny@users.noreply.github.com>
Date: Tue, 26 Sep 2017 14:49:05 +0100
Subject: [PATCH 2/2] Clarify warning message when CloudTrail is not consumed
 by CloudWatch

---
 prowler | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/prowler b/prowler
index bb460856..3f07b831 100755
--- a/prowler
+++ b/prowler
@@ -1030,7 +1030,7 @@ check31(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1047,7 +1047,7 @@ check32(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1064,7 +1064,7 @@ check33(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1081,7 +1081,7 @@ check34(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1098,7 +1098,7 @@ check35(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1115,7 +1115,7 @@ check36(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1132,7 +1132,7 @@ check37(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1149,7 +1149,7 @@ check38(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1166,7 +1166,7 @@ check39(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1183,7 +1183,7 @@ check310(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1200,7 +1200,7 @@ check311(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1217,7 +1217,7 @@ check312(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1234,7 +1234,7 @@ check313(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }
 
@@ -1251,7 +1251,7 @@ check314(){
       textWarn "CloudWatch group found but no metric filters or alarms associated"
     fi
   else
-    textWarn "No CloudWatch group found but no metric filters or alarms associated"
+    textWarn "No CloudWatch group found for CloudTrail events"
   fi
 }