Use timestamps for summary graph x-axis.

RELEASE-NOTES.md

@@ -6,6 +6,7 @@ Features:
 
 * rps is now a separate stat from result codes
 * summary graph time does not auto-update on open
+* graph x-axis now use times rather than minutes since test start
 
 ## v0.3.0 (2011/06/16) ##
 

TODO

@@ -23,6 +23,5 @@
 - Add JMX monitoring support
 - Add support for bar graphs
 - Methods for graphing histograms
-- Timestamp graphs rather than using minutes
 - Allow graphs to be overlayed
 - Use agents for concurrent connections

lib/reporting/report.js

@@ -15,7 +15,7 @@ var NODELOAD_CONFIG = config.NODELOAD_CONFIG;
 var START = NODELOAD_CONFIG.START;
 var DYGRAPH_SOURCE = require('./dygraph.tpl.js').DYGRAPH_SOURCE;
 }
-var Chart, timeFromStart;
+var Chart;
 
 /** A Report contains a summary object and set of charts. It can be easily updated using the stats from
 a monitor.js#Monitor or monitor.js#MonitorGroup using updateFromMonitor()/updateFromMonitorGroup().
@@ -79,7 +79,7 @@ var Chart = exports.Chart = function(name) {
     this.name = name;
     this.uid = util.uid();
     this.columns = ["time"];
-    this.rows = [[timeFromStart()]];
+    this.rows = [[Date.now()]];
 };
 Chart.prototype = {
     /** Put a row of data into the chart. The current time will be used as the x-value. The lines in the
@@ -93,7 +93,7 @@ Chart.prototype = {
                 }
     */
     put: function(data) {
-        var self = this, row = [timeFromStart()]; 
+        var self = this, row = [Date.now()]; 
         util.forEach(data, function(column, val) {
             var col = self.columns.indexOf(column);
             if (col < 0) {
@@ -165,13 +165,4 @@ ReportGroup.prototype = {
         this.loggingTimeoutId = setTimeout(this.writeToLog_.bind(this), this.refreshIntervalMs);
         this.logger.clear(this.getHtml());
     }
-};
-
-// =================
-// Private methods
-// =================
-
-/** current time from start of nodeload process in 100ths of a minute */
-function timeFromStart() {
-    return (Math.floor((new Date().getTime() - START) / 600) / 100);
-}
+};

lib/reporting/summary.tpl

@@ -70,9 +70,9 @@
                 
                 for (var j in report.charts) {
                     var chart = report.charts[j];
-
+                    var rows = chart.rows.map(function(x) { return [new Date(x[0])].concat(x.slice(1)) });
                     if (graphs[chart.uid]) {
-                        graphs[chart.uid].updateOptions({"file": chart.rows, labels: chart.columns});
+                        graphs[chart.uid].updateOptions({"file": rows, labels: chart.columns});
                     } else {
                         var newchart = document.createElement("div");
                         newchart.setAttribute("class", "post");
@@ -86,11 +86,13 @@
                         main.appendChild(newchart);
                         graphs[chart.uid] = new Dygraph(
                             document.getElementById("chart" + chart.uid),
-                            chart.rows,
+                            rows,
                             {
                                 labelsDiv: document.getElementById("chartlegend" + chart.uid),
                                 labelsSeparateLines: true,
-                                labels: chart.columns
+                                labels: chart.columns,
+                                xAxisLabelWidth: 80,
+                                pixelsPerXLabel: 100
                             });
                     }
                 }