Adds --flat flag

nginx-access-log-parser.py

@@ -1,6 +1,11 @@
 import os
 import re
 import json
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-f', '--flat', action='store_true')
+args = parser.parse_args()
 
 logPath = '/var/log/nginx/'
 logFiles = ['access.log', 'pajonk.kavalanche.net.access.log', 'stock.kavalanche.net.access.log', 'todolist.kavalanche.net.access.log']
@@ -15,7 +20,13 @@ for logFile in logFiles:
 
     for log in logs:
         regex = re.match('(?P<remote_addr>\d+\.\d+\.\d+\.\d+)\s-\s(?P<remote_user>[^\s]+)\s\[(?P<time_local>[^\]]+)\]\s"(?P<request>[^"]+)"\s(?P<status>\d+)\s(?P<body_bytes_sent>\d+)\s"(?P<http_referer>[^"]+)"\s"(?P<http_user_agent>[^"]+)"', log)
-        logsInFile.append(regex.groupdict())
-    output.append({logFile: logsInFile})
+        entry = regex.groupdict();
+        if args.flat:
+            entry['file'] = logFile
+            output.append(entry)
+        else:
+            logsInFile.append(entry)
+    if not args.flat:
+        output.append({logFile: logsInFile})
 
 print(json.dumps(output))