From fa9b227a7b13f90e57815557fa58f3af8c1fd834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?=
 <konstruktoid@users.noreply.github.com>
Date: Fri, 13 Oct 2017 10:38:31 +0200
Subject: [PATCH] check 7.x json log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
---
 tests/7_docker_swarm_configuration.sh | 33 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/tests/7_docker_swarm_configuration.sh b/tests/7_docker_swarm_configuration.sh
index 5b240aa..a3a80c7 100644
--- a/tests/7_docker_swarm_configuration.sh
+++ b/tests/7_docker_swarm_configuration.sh
@@ -7,8 +7,10 @@ info "7 - Docker Swarm Configuration"
 check_7_1="7.1  - Ensure swarm mode is not Enabled, if not needed"
 if docker info 2>/dev/null | grep -e "Swarm:*\sinactive\s*" >/dev/null 2>&1; then
   pass "$check_7_1"
+  logjson "7.1" "PASS"
 else
   warn "$check_7_1"
+  logjson "7.1" "WARN"
 fi
 
 # 7.2
@@ -17,11 +19,14 @@ if docker info 2>/dev/null | grep -e "Swarm:*\sactive\s*" >/dev/null 2>&1; then
   managernodes=$(docker node ls | grep -c "Leader")
   if [ "$managernodes" -le 1 ]; then
     pass "$check_7_2"
+    logjson "7.2" "PASS"
   else
     warn "$check_7_2"
+    logjson "7.2" "WARN"
   fi
 else
   pass "$check_7_2 (Swarm mode not enabled)"
+  logjson "7.2" "PASS"
 fi
 
 # 7.3
@@ -30,11 +35,14 @@ if docker info 2>/dev/null | grep -e "Swarm:*\sactive\s*" >/dev/null 2>&1; then
   netstat -lnt | grep -e '\[::]:2377 ' -e ':::2377' -e '*:2377 ' -e ' 0\.0\.0\.0:2377 ' >/dev/null 2>&1
   if [ $? -eq 1 ]; then
     pass "$check_7_3"
+    logjson "7.3" "PASS"
   else
     warn "$check_7_3"
+    logjson "7.3" "WARN"
   fi
 else
   pass "$check_7_3 (Swarm mode not enabled)"
+  logjson "7.3" "PASS"
 fi
 
 # 7.4
@@ -47,10 +55,12 @@ if docker network ls --filter driver=overlay --quiet | \
     if docker network inspect --format '{{.Name}} {{ .Options }}' "$encnet" | \
        grep -v 'encrypted:' 2>/dev/null 1>&2; then
       warn "     * Unencrypted overlay network: $(docker network inspect --format '{{ .Name }} ({{ .Scope }})' "$encnet")"
+      logjson "7.4" "WARN: $(docker network inspect --format '{{ .Name }} ({{ .Scope }})' "$encnet")"
     fi
   done
 else
   pass "$check_7_4"
+  logjson "7.4" "PASS"
 fi
 
 # 7.5
@@ -58,11 +68,14 @@ check_7_5="7.5  - Ensure Docker's secret management commands are used for managi
 if docker info 2>/dev/null | grep -e "Swarm:\s*active\s*" >/dev/null 2>&1; then
   if [ "$(docker secret ls -q | wc -l)" -ge 1 ]; then
     pass "$check_7_5"
+    logjson "7.5" "PASS"
   else
     info "$check_7_5"
+    logjson "7.5" "INFO"
   fi
 else
   pass "$check_7_5 (Swarm mode not enabled)"
+  logjson "7.5" "PASS"
 fi
 
 # 7.6
@@ -70,19 +83,24 @@ check_7_6="7.6  - Ensure swarm manager is run in auto-lock mode"
 if docker info 2>/dev/null | grep -e "Swarm:\s*active\s*" >/dev/null 2>&1; then
   if ! docker swarm unlock-key 2>/dev/null | grep 'SWMKEY' 2>/dev/null 1>&2; then
     warn "$check_7_6"
+    logjson "7.6" "WARN"
   else
     pass "$check_7_6"
+    logjson "7.6" "PASS"
   fi
 else
   pass "$check_7_6 (Swarm mode not enabled)"
+  logjson "7.6" "PASS"
 fi
 
 # 7.7
 check_7_7="7.7  - Ensure swarm manager auto-lock key is rotated periodically"
 if docker info 2>/dev/null | grep -e "Swarm:\s*active\s*" >/dev/null 2>&1; then
   note "$check_7_7"
+  logjson "7.7" "NOTE"
 else
   pass "$check_7_7 (Swarm mode not enabled)"
+  logjson "7.7" "PASS"
 fi
 
 # 7.8
@@ -90,25 +108,32 @@ check_7_8="7.8  - Ensure node certificates are rotated as appropriate"
 if docker info 2>/dev/null | grep -e "Swarm:\s*active\s*" >/dev/null 2>&1; then
   if docker info 2>/dev/null | grep "Expiry Duration: 2 days"; then
     pass "$check_7_8"
+    logjson "7.8" "PASS"
   else
     info "$check_7_8"
+    logjson "7.8" "INFO"
   fi
 else
   pass "$check_7_8 (Swarm mode not enabled)"
+  logjson "7.8" "PASS"
 fi
 
 # 7.9
 check_7_9="7.9  - Ensure CA certificates are rotated as appropriate"
 if docker info 2>/dev/null | grep -e "Swarm:\s*active\s*" >/dev/null 2>&1; then
-	info "$check_7_9"
+  info "$check_7_9"
+  logjson "7.9" "INFO"
 else
-	pass "$check_7_9 (Swarm mode not enabled)"
+  pass "$check_7_9 (Swarm mode not enabled)"
+  logjson "7.9" "PASS"
 fi
 
 # 7.10
 check_7_10="7.10 - Ensure management plane traffic has been separated from data plane traffic"
 if docker info 2>/dev/null | grep -e "Swarm:\s*active\s*" >/dev/null 2>&1; then
-	info "$check_7_10"
+  info "$check_7_10"
+  logjson "7.10" "INFO"
 else
-	pass "$check_7_10 (Swarm mode not enabled)"
+  pass "$check_7_10 (Swarm mode not enabled)"
+  logjson "7.10" "PASS"
 fi