Merge lp:~joetalbott/qa-dashboard/eventstat_seconds into lp:qa-dashboard

[Joe Talbott]

eventstat - Don't show second Y axis if there is no duration column.

* also adds support for overriding STATIC_URL_BASE in local_settings.py

eventstat - Don't show second Y axis if there is no duration column.

* also adds support for overriding STATIC_URL_BASE in local_settings.py

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:695
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/270/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/270/rebuild

review: Approve (continuous-integration)

[Paul Larson (pwlars)]

Looks ok to me, thanks for the speedy fix Joe!

review: Approve

=== modified file 'common/static/js/graph.js'
--- common/static/js/graph.js	2013-10-17 20:23:04 +0000
+++ common/static/js/graph.js	2013-12-04 02:59:31 +0000
@@ -246,17 +246,18 @@
         on: {
           success: function (id, result) {
             var data = Y.JSON.parse(result.responseText);
+            var has_duration = false;
 
             var values = Array();
             var values_labels = Array();
 
             var graphs = Array();
 
+            var d = [values.length, null, null, null, null, null];
             if (data.last_release_avg > 0) {
-              values.push([0, null, null, null, null, null, null, null]);
-            } else {
-              values.push([0, null, null, null, null, null, null]);
+              d.push(null);
             }
+            values.push(d);
             values_labels.push("");
 
             for (x in data.image_data) {
@@ -273,18 +274,21 @@
                   labels.push("");
               }
 
-              row_data.push(record.duration);
-              labels.push("duration");
+              if (record.hasOwnProperty('duration')) {
+                has_duration = true;
+                row_data.push(record.duration);
+                labels.push("duration");
+              }
 
               values.push(row_data);
               values_labels.push(record.build_number)
             }
 
+            d = [values.length, null, null, null, null, null];
             if (data.last_release_avg > 0) {
-              values.push([values.length, null, null, null, null, null, null, null]);
-            } else {
-              values.push([values.length, null, null, null, null, null, null]);
+              d.push(null);
             }
+            values.push(d);
             values_labels.push("");
 
             var width = 400;
@@ -295,10 +299,7 @@
                height = 400;
             }
 
-            g = new Dygraph(
-              document.getElementById(div_id),
-              values,
-              {
+            var graph_data = {
                 width: width,
                 height: height,
                 plotter: errorBarChartPlotter,
@@ -310,15 +311,8 @@
                 drawXGrid: false,
                 drawYGrid: false,
                 ylabel: unit,
-                y2label: "seconds",
                 hideOverlayOnMouseOut: false,
                 legend: "always",
-                'duration': {
-                    axis: {
-                        digitsAfterDecimal: 0,
-                        valueRange: [0,1000]
-                    }
-                },
                 unhighlightCallback: function(me, e) {
                     if (me.isZoomed('x')) return;
                     var range = me.xAxisRange();
@@ -339,24 +333,40 @@
                         return "";
                     }
                   },
-                  y2: {
-                    ticker: function(min, max, pixels, opts, dygraph, vals) {
-                      return [
-                        {v:0, label:"0"},
-                        {v:100, label:"100"},
-                        {v:200, label:"200"},
-                        {v:300, label:"300"},
-                        {v:400, label:"400"},
-                        {v:500, label:"500"},
-                        {v:600, label:"600"},
-                        {v:700, label:"700"},
-                        {v:800, label:"800"},
-                        {v:900, label:"900"}
-                      ];
-                    }
+                }
+            }
+
+            if (has_duration) {
+              graph_data.y2label = "seconds";
+              graph_data.duration = {
+                  axis: {
+                      digitsAfterDecimal: 0,
+                      valueRange: [0,1000]
                   }
+              }
+
+              graph_data.axis.y2 = {
+                ticker: function(min, max, pixels, opts, dygraph, vals) {
+                  return [
+                    {v:0, label:"0"},
+                    {v:100, label:"100"},
+                    {v:200, label:"200"},
+                    {v:300, label:"300"},
+                    {v:400, label:"400"},
+                    {v:500, label:"500"},
+                    {v:600, label:"600"},
+                    {v:700, label:"700"},
+                    {v:800, label:"800"},
+                    {v:900, label:"900"}
+                  ];
                 }
               }
+            }
+
+            g = new Dygraph(
+              document.getElementById(div_id),
+              values,
+              graph_data
             );
 
             var rows = g.numRows();

=== modified file 'eventstat/api.py'
--- eventstat/api.py	2013-10-18 20:39:52 +0000
+++ eventstat/api.py	2013-12-04 02:59:31 +0000
@@ -90,7 +90,6 @@
             max=metric.maximum,
             avg=metric.average,
             std=metric.stddev,
-            duration=0,
         )
         if method == "image":
             image_info['build_number'] = metric.image.build_number
@@ -142,7 +141,6 @@
                 max=t['maximum'],
                 avg=t['average'],
                 std=t['stddev'],
-                duration=0,
             ),
         )
 
@@ -188,7 +186,6 @@
                 max=t['maximum'],
                 avg=t['average'],
                 std=t['stddev'],
-                duration=0,
             ),
         )
 

=== modified file 'qa_dashboard/settings.py'
--- qa_dashboard/settings.py	2013-12-02 20:29:32 +0000
+++ qa_dashboard/settings.py	2013-12-04 02:59:31 +0000
@@ -94,7 +94,10 @@
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = 'www/static/'
 
-STATIC_URL_BASE = '//assets.ubuntu.com/sites/dashboard/'
+try:
+    from local_settings import STATIC_URL_BASE
+except ImportError:
+    STATIC_URL_BASE = '//assets.ubuntu.com/sites/dashboard/'
 
 from assets_revision import revision as assets_revision