Merge lp:~thomir-deactivatedaccount/uci-engine/trunk-fix-nfss-lrt-graph into lp:uci-engine

[Thomi Richards]

Fix up the lrt random_gesture test graph definition.

This branch fixes the 'lrt' graph definition:

* X axis tick marks are now at constant intervals
* X axis labels are now image build names
* Y axis are aligned for value and standard deviation.

[Christopher Lee (veebers)]

LGTM, nicely done.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:812
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1487/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1487/rebuild

review: Approve (continuous-integration)

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~thomir/uci-engine/trunk-fix-nfss-lrt-graph into lp:uci-engine failed. Below is the output from the failed tests.

Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
2014-09-30 13:15:14 INFO juju.cmd supercommand.go:37 running jujud [1.20.8.1-precise-amd64 gc]
2014-09-30 13:15:14 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2014-09-30 13:15:14 INFO juju.jujud unit.go:78 unit agent unit-ci-airline-gatekeeper-restish-0 start (1.20.8.1-precise-amd64 [gc])
2014-09-30 13:15:14 INFO juju.worker runner.go:260 start "api"
2014-09-30 13:15:14 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2014-09-30 13:15:14 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2014-09-30 13:15:14 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2014-09-30 13:15:14 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2014-09-30 13:15:14 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2014-09-30 13:15:14 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2014-09-30 13:15:15 INFO juju.worker runner.go:260 start "upgrader"
2014-09-30 13:15:15 INFO juju.worker runner.go:260 start "logger"
2014-09-30 13:15:15 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2014-09-30 13:15:15 INFO juju.worker runner.go:260 start "uniter"
2014-09-30 13:15:15 DEBUG juju.worker.logger logger.go:60 logger setup
2014-09-30 13:15:15 INFO juju.worker runner.go:260 start "apiaddressupdater"
2014-09-30 13:15:15 INFO juju.worker runner.go:260 start "rsyslog"
2014-09-30 13:15:15 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-airline-gatekeeper-restish-0" "tarmac-local"
2014-09-30 13:15:15 INFO juju.worker.apiaddressupdater apiaddressupdater.go:61 API addresses updated to [["public:localhost" "local-cloud:10.0.3.1" "local-machine:127.0.0.1" "local-cloud:172.19.0.6" "local-machine:::1" "fe80::f816:3eff:fec0:3a29" "fe80::a880:d3ff:feed:315d"]]
2014-09-30 13:15:15 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>=WARNING;unit=DEBUG"
2014-09-30 13:15:15 INFO juju-log Making dir /srv/ci-airline-gatekeeper-restish/nagios www-data:www-data 755
2014-09-30 13:15:15 INFO juju-log installing apt packages...
2014-09-30 13:15:16 INFO install gpg: keyring `/tmp/tmpDlPUqV/secring.gpg' created
2014-09-30 13:15:16 INFO install gpg: keyring `/tmp/tmpDlPUqV/pubring.gpg' created
2014-09-30 13:15:16 INFO install gpg: requesting key 6A8DFC40 from hkp server keyserver.ubuntu.com
2014-09-30 13:15:16 INFO install gpgkeys: key 0E15E112E2B65CF175122D00F7F9102D6A8DFC40 not found on keyserver
2014-09-30 13:15:16 INFO install gpg: no valid OpenPGP data found.
2014-09-30 13:15:16 INFO install gpg: Total number processed: 0
2014-09-30 13:15:16 INFO install recv failed
2014-09-30 1...

=== modified file 'nf-stats-service/web_static/graphs/lrt.js'
--- nf-stats-service/web_static/graphs/lrt.js	2014-09-18 03:17:38 +0000
+++ nf-stats-service/web_static/graphs/lrt.js	2014-09-29 03:21:16 +0000
@@ -7,15 +7,10 @@
 
     function isolator(key, factor) {
         return function(item) {
-            var str = item.data['image'];
-            var y = str.substr(0,4);
-            var m = str.substr(4,2);
-            var d = str.substr(6,2);
-
             return {
                 value: Math.max(item.data[key], 0) / (factor || 1),
                 image: item.data['image'],
-                date: dates.dateParser([y, m, d, '04:00:01.0+00'].join('-')),
+                date: dates.dateParser(item.date_entered),
             };
         };
     }
@@ -38,6 +33,12 @@
             },
         ];
 
+        // Figure out the largest value we show on the graph - we use this to set the
+        // bar and line y axis values.
+        $scope.maxY = Math.max.apply(null, $scope.graphData.map(function(data_series) {
+            return d3.max(data_series.values, function(i) {return i.value;});
+        }));
+
         $scope.tableData = $scope.graphData.concat([
             {
                 key: 'Min',
@@ -56,6 +57,8 @@
 
     $rootScope.$on("newdata", function(e, data) {
         $scope.massageGraphData(data);
+        $scope.options.chart.lines = { forceY: [0, $scope.maxY] };
+        $scope.options.chart.bars = { forceY: [0, $scope.maxY] };
         $scope.api.refresh();
     });
 
@@ -64,11 +67,18 @@
             type: 'linePlusBarChart',
             height: 400,
             margin: {left:100, top:10, bottom:120, right:100},
-            x: modifiers.accessor('date'),
+            // X axis values are just the indexes...
+            x: function(item, idx) { return idx; },
             y: modifiers.accessor('value'),
             useInteractiveGuideline: true,
             xAxis: {
-                tickFormat: dates.dateFormatter(),
+                // and we translate those to image numbers here:
+                tickFormat: function(idx) { 
+                    if($scope.graphData[0].values[idx]) {
+                        // make this end in '.date' if you'd rather show the date.
+                        return $scope.graphData[0].values[idx].image;  
+                    } 
+                },
                 rotateLabels: -45,
             },
             y1Axis: {