fix bug in X axis timezone

Author: ben-spiller

CHANGELOG.rst

@@ -1,6 +1,7 @@
 3.7.dev
 -------
 - It is not longer required for the prefix in userStatusLines to end with a ":". 
+- Fixed a bug which could cause the wrong time range to be selected for the x axis if the analyzer was run in a different timezone from the timezone where the HTML is viewed. 
 
 3.6
 ---

apamax/log_analyzer.py

@@ -1847,10 +1847,14 @@ def writeOverviewHTMLForAllFiles(self, overviewHTML, **extra):
 
 		# zoom to show everything
 		times = [f.get('startTime') for f in self.files]+[f.get('endTime') for f in self.files]
-		times = sorted([t.timestamp() for t in times if t])
+		times = sorted([t for t in times if t])
 		if len(times) >= 2:
+			times = [min(times), max(times)]
 			defaultoptions['dateWindow'] = [
-				int(1000*min(times)), int(1000*max(times))
+				f"new Date({dt.year},{dt.month-1},{dt.day},{dt.hour},{dt.minute},{dt.second})"
+				#1000*dt.timestamp()
+				for dt in times
+				#int(1000*min(times)), int(1000*max(times))
 			]
 
 		with io.open(os.path.join(self.outputdir, 'overview.html'), 'w', encoding='utf-8') as out:
@@ -1937,7 +1941,8 @@ def writeOverviewHTMLForAllFiles(self, overviewHTML, **extra):
 					with io.open(tmpfile, 'r', encoding='utf-8') as datafile:
 						shutil.copyfileobj(datafile, out)
 					os.remove(tmpfile)
-					out.write('],\n'+json.dumps(options)[:-1]+',"legendFormatter":legendFormatter}'+'\n);\n')
+					# this regex converts a JavaScript string containing new Date(...) to a proper JavaScript object
+					out.write('],\n'+re.sub('"(new [^"]*)"', "\\1", json.dumps(options)[:-1])+',"legendFormatter":legendFormatter}'+'\n);\n')
 					out.write('\ncharts.push(g);\n')
 					if c == 'rates':
 						for a in file['annotations']: