write file in correct JSON format

Author: memodi

cmd/flow_capture.go

@@ -79,13 +79,13 @@ func runFlowCaptureOnAddr(port int, filename string) error {
 	}
 	log.Trace("Created flow folder")
 
-	f, err = os.Create("./output/flow/" + filename + ".json")
+	f, err = os.Create("./output/flow/" + filename + ".txt")
 	if err != nil {
 		log.Errorf("Create file %s failed: %v", filename, err.Error())
 		log.Fatal(err)
 	}
 	defer f.Close()
-	log.Trace("Created json file")
+	log.Trace("Created flow logs txt file")
 
 	// Initialize sqlite DB
 	db := initFlowDB(filename)

scripts/functions.sh

@@ -297,6 +297,34 @@ function copyOutput() {
   echo "Copying collector output files..."
   mkdir -p ./output
   ${K8S_CLI_BIN} cp -n "$namespace" collector:output ./output
+  flowFile=$(find ./output -name "*txt" | sort | tail -1)
+  if [[ -n "$flowFile" ]] ; then
+    jsonFile=$(buildJSON "$flowFile")
+    if [[ -f `which jq` ]]; then
+      jq empty < "$jsonFile"
+      if [[ $? -eq 1 ]] ; then
+        rm "$jsonFile"
+        echo "Flow file conversion to JSON failed, please use the txt file: $flowFile"
+      else
+        rm "$flowFile"
+      fi
+    fi
+  fi
+}
+
+function buildJSON() {
+  file=$1
+  filename=$(basename "$file")
+  dirpath=$(dirname "$file")
+  filenamePrefix=$(echo "$filename" | sed -E 's/(.*)\..*/\1/')
+  UPDATED_JSON_FILE="$dirpath/$filenamePrefix.json"
+  { 
+    echo "["
+    # remove last line and "," (last character) of the last flowlog for valid json
+    sed '$d' "$file" | sed '$ s/.$//'
+    echo "]"
+  } >> "$UPDATED_JSON_FILE"
+  echo "$UPDATED_JSON_FILE"
 }
 
 function deleteServiceMonitor() {