Merge lp:~cjohnston/qa-dashboard/revert-r694 into lp:qa-dashboard

[Chris Johnston]

Revert out r694

r694 is causing issues with power graphs. reverting them out until things can be properly fixed.

[Paul Larson (pwlars)]

ack, hopefully we can sort out what's causing the issues in the morning. Thanks!

review: Approve

=== modified file 'common/static/js/graph.js'
--- common/static/js/graph.js	2013-12-04 02:51:17 +0000
+++ common/static/js/graph.js	2013-12-12 04:40:11 +0000
@@ -246,18 +246,17 @@
         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) {
-              d.push(null);
+              values.push([0, null, null, null, null, null, null, null]);
+            } else {
+              values.push([0, null, null, null, null, null, null]);
             }
-            values.push(d);
             values_labels.push("");
 
             for (x in data.image_data) {
@@ -274,21 +273,18 @@
                   labels.push("");
               }
 
-              if (record.hasOwnProperty('duration')) {
-                has_duration = true;
-                row_data.push(record.duration);
-                labels.push("duration");
-              }
+              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) {
-              d.push(null);
+              values.push([values.length, null, null, null, null, null, null, null]);
+            } else {
+              values.push([values.length, null, null, null, null, null, null]);
             }
-            values.push(d);
             values_labels.push("");
 
             var width = 400;
@@ -299,7 +295,10 @@
                height = 400;
             }
 
-            var graph_data = {
+            g = new Dygraph(
+              document.getElementById(div_id),
+              values,
+              {
                 width: width,
                 height: height,
                 plotter: errorBarChartPlotter,
@@ -311,8 +310,15 @@
                 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();
@@ -333,40 +339,24 @@
                         return "";
                     }
                   },
-                }
-            }
-
-            if (has_duration) {
-              graph_data.y2label = "seconds";
-              graph_data.duration = {
-                  axis: {
-                      digitsAfterDecimal: 0,
-                      valueRange: [0,1000]
+                  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"}
+                      ];
+                    }
                   }
-              }
-
-              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-12-04 02:51:17 +0000
+++ eventstat/api.py	2013-12-12 04:40:11 +0000
@@ -90,6 +90,7 @@
             max=metric.maximum,
             avg=metric.average,
             std=metric.stddev,
+            duration=0,
         )
         if method == "image":
             image_info['build_number'] = metric.image.build_number
@@ -141,6 +142,7 @@
                 max=t['maximum'],
                 avg=t['average'],
                 std=t['stddev'],
+                duration=0,
             ),
         )
 
@@ -186,6 +188,7 @@
                 max=t['maximum'],
                 avg=t['average'],
                 std=t['stddev'],
+                duration=0,
             ),
         )
 
 
=== modified file 'qa_dashboard/settings.py'
--- qa_dashboard/settings.py	2013-12-04 02:50:38 +0000
+++ qa_dashboard/settings.py	2013-12-12 04:40:11 +0000
@@ -94,10 +94,7 @@
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = 'www/static/'
 
-try:
-    from local_settings import STATIC_URL_BASE
-except ImportError:
-    STATIC_URL_BASE = '//assets.ubuntu.com/sites/dashboard/'
+STATIC_URL_BASE = '//assets.ubuntu.com/sites/dashboard/'
 
 from assets_revision import revision as assets_revision