Compress again by default all data inside HTMLs

f18m · Dec 4, 2021 · 9dda920 · 9dda920
1 parent 673aa28
commit 9dda920
Show file tree

Hide file tree

Showing 6 changed files with 596 additions and 205 deletions.
diff --git a/examples/baremetal1.html b/examples/baremetal1.html
diff --git a/examples/docker-collecting-baremetal-stats.html b/examples/docker-collecting-baremetal-stats.html
diff --git a/examples/docker-userapp-with-embedded-collector.html b/examples/docker-userapp-with-embedded-collector.html
diff --git a/examples/docker-userapp-with-embedded-collector.json.gz b/examples/docker-userapp-with-embedded-collector.json.gz
diff --git a/examples/docker-userapp.html b/examples/docker-userapp.html
diff --git a/tools/chart/cmonitor_chart.py.j2 b/tools/chart/cmonitor_chart.py.j2
@@ -32,7 +32,7 @@ GRAPH_SOURCE_DATA_CGROUP = 2
 GRAPH_TYPE_AREA_CHART = 1
 GRAPH_TYPE_BUBBLE_CHART = 2
 
-SAVE_DEFLATED_JS_DATATABLES = False
+SAVE_DEFLATED_JS_DATATABLES = True
 JS_INDENT_SIZE = 2
 
 # see https://developers.google.com/chart/interactive/docs/reference#dateformat
@@ -174,7 +174,10 @@ class GoogleChartsTimeSeries(object):
         )
 
         # add DateFormatter to use custom formatting of the 1st column (like everywhere else we assume first column is the timestamp)
-        ret_string += "var date_formatter = new google.visualization.DateFormat({pattern: '%s'});\n" % (TOOLTIP_DATEFORMAT)
+        ret_string += (
+            "var date_formatter = new google.visualization.DateFormat({pattern: '%s'});\n"
+            % (TOOLTIP_DATEFORMAT)
+        )
         ret_string += "date_formatter.format(data_%s, 0);\n\n" % (graphName)
 
         return ret_string