From eed35c92b7d699ed09cb6bdbb3c277d26894d7fd Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 28 Nov 2019 18:00:49 +0100
Subject: [PATCH] log: parse timestamps %Y/%m/%d %H:%M:%S for
 https://github.com/opnsense/core/issues/3831

---
 src/opnsense/scripts/systemhealth/queryLog.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/opnsense/scripts/systemhealth/queryLog.py b/src/opnsense/scripts/systemhealth/queryLog.py
index 5e16b76e6..d0ff0eb3b 100755
--- a/src/opnsense/scripts/systemhealth/queryLog.py
+++ b/src/opnsense/scripts/systemhealth/queryLog.py
@@ -40,6 +40,7 @@ sys.path.insert(0, "/usr/local/opnsense/site-python")
 from log_helper import reverse_log_reader, fetch_clog
 import argparse
 squid_ext_timeformat = r'.*(\[\d{1,2}/[A-Za-z]{3}/\d{4}:\d{1,2}:\d{1,2}:\d{1,2} \+\d{4}\]).*'
+squid_timeformat = r'^(\d{4}/\d{1,2}/\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}).*'
 
 if __name__ == '__main__':
     # handle parameters
@@ -111,6 +112,12 @@ if __name__ == '__main__':
                             record['timestamp'] = ts.isoformat()
                             # strip timestamp
                             record['line'] = record['line'].replace(grp, '')
+                        elif re.match(squid_timeformat, record['line']):
+                            tmp = re.match(squid_timeformat, record['line'])
+                            grp = tmp.group(1)
+                            ts = datetime.datetime.strptime(grp, "%Y/%m/%d %H:%M:%S")
+                            record['timestamp'] = ts.isoformat()
+                            record['line'] = record['line'][19:].strip()
                         result['rows'].append(record)
                     elif result['total_rows'] > offset + limit:
                         # do not fetch data until end of file...