Merge lp:~pwlars/qa-dashboard/wakeup-axis-label into lp:qa-dashboard

[Paul Larson]

Here's the other label fix that we need. I think this should get all the places we need to change.

Here's the other label fix that we need. I think this should get all the places we need to change.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:690
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~pwlars/qa-dashboard/wakeup-axis-label/+merge/197638/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/271/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Joe Talbott (joetalbott)]

+1 for clarity.

review: Approve

=== modified file 'eventstat/templates/eventstat/arch_overview.html'
--- eventstat/templates/eventstat/arch_overview.html	2013-10-11 02:45:45 +0000
+++ eventstat/templates/eventstat/arch_overview.html	2013-12-04 03:28:20 +0000
@@ -38,14 +38,14 @@
     <div id="machine-{{ machine.id }}" style="float: left; width: 800px; height: 400px;"></div>
     {% if machine.has_image %}
       <script type="text/javascript">
-        draw_power_graph("{% url "eventstat_api_machine_overview" machine.id "image" "total" %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", true, "wakeups");
+        draw_power_graph("{% url "eventstat_api_machine_overview" machine.id "image" "total" %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", true, "Average wakeups/min");
       </script>
       <div id="machine-{{ machine.id }}-label" style="width: 60px; padding-top: 5px; float: left;"></div>
   </div>
       <a href="{% url "eventstat_machine_details" arch=arch machine_id=machine.id method="install" %}">Detailed view</a>
     {% elif machine.has_upgrade %}
       <script type="text/javascript">
-        draw_power_graph("{% url "eventstat_api_machine_overview" machine.id "upgrade" "total" %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", true, "wakeups");
+        draw_power_graph("{% url "eventstat_api_machine_overview" machine.id "upgrade" "total" %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", true, "Average wakeups/min");
       </script>
       <div id="machine-{{ machine.id }}-label" style="width: 60px; padding-top: 5px; float: left;"></div>
   </div>

=== modified file 'eventstat/templates/eventstat/task_overview.html'
--- eventstat/templates/eventstat/task_overview.html	2013-10-11 02:45:45 +0000
+++ eventstat/templates/eventstat/task_overview.html	2013-12-04 03:28:20 +0000
@@ -28,12 +28,12 @@
               {% if upgrade %}
             <script type="text/javascript">
             var big = true;
-              draw_power_graph("{% url "eventstat_api_task_upgrade_overview" machine.id upgrade.id task.task %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", big, "wakeups");
+              draw_power_graph("{% url "eventstat_api_task_upgrade_overview" machine.id upgrade.id task.task %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", big, "Average wakeups/min");
           </script>
           {% else %}
             <script type="text/javascript">
                 var big = true;
-              draw_power_graph("{% url "eventstat_api_task_overview" machine.id image.id task.task %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", big, "wakeups");
+              draw_power_graph("{% url "eventstat_api_task_overview" machine.id image.id task.task %}", "machine-{{ machine.id }}", "machine-{{ machine.id}}-label", big, "Average wakeups/min");
           </script>
           {% endif %}
             <div id="machine-{{ machine.id }}-label" style="width: 60px; padding-top: 5px; float: left;"></div>