Merge remote-tracking branch 'origin/master'

stackviz/static/js/timeline.js

@@ -100,13 +100,15 @@ var getDstatLanes = function(data) {
       value: function(d) {
         return d.total_cpu_usage_wai;
       },
-      color: "#e0bcbc"
+      color: "#e0bcbc",
+      text: "CPU wait"
     }, {
       scale: d3.scale.linear().domain([0, 100]),
       value: function(d) {
         return d.total_cpu_usage_usr + d.total_cpu_usage_sys;
       },
-      color: "#668cb2"
+      color: "#668cb2",
+      text: "CPU (user+sys)"
     }]);
   }
 
@@ -179,10 +181,28 @@ var initTimeline = function(options, data, timeExtents) {
   dstatLanes.forEach(function(lane, i) {
     var laneGroup = dstatGroup.append("g");
 
+    var text = laneGroup.append("text")
+        .attr("y", function(d) { return y3(i + 0.5); })
+        .attr("dy", ".5ex")
+        .attr("text-anchor", "end")
+        .style("font", "10px sans-serif");
+
+    var dy = 0;
+
     // precompute some known info for each lane's paths
     lane.forEach(function(pathDef) {
       var laneHeight = 0.8 * y3(1);
 
+      if ('text' in pathDef) {
+        text.append("tspan")
+            .attr("x", -margin.right)
+            .attr("dy", dy)
+            .text(pathDef.text)
+            .attr("fill", function(d) { return pathDef.color; });
+
+        dy += 10;
+      }
+
       pathDef.scale.range([laneHeight, 0]);
       pathDef.area = d3.svg.area()
           .x(function(d) { return x1(d.system_time); })
@@ -532,9 +552,9 @@ function loadTimeline(path, options) { // eslint-disable-line no-unused-vars
     data = data.filter(function (d) { return d.duration > 0; });
 
     var nested = d3.nest()
-    .key(function(d) { return parseWorker(d.tags); })
-    .sortKeys(d3.ascending)
-    .entries(data);
+        .key(function(d) { return parseWorker(d.tags); })
+        .sortKeys(d3.ascending)
+        .entries(data);
 
     // include dstat if available
     if (options.dstatPath && !options.dstatData) {