dashboard: fix calvin

circle/dashboard/templates/dashboard/node-list/column-monitor.html

@@ -9,7 +9,7 @@
     style="width: {% widthratio record.cpu_usage 1 100 %}%;">
     style="width: {% widthratio record.cpu_usage 1 100 %}%;">
     <span class="progress-bar-text">
     <span class="progress-bar-text">
       {% if record.cpu_usage != None %}
       {% if record.cpu_usage != None %}
-        {{ record.cpu_usage|floatformat:1 }} %
+        {% widthratio record.cpu_usage 1 100 %} %
       {% else %}
       {% else %}
         -
         -
       {% endif %}
       {% endif %}

circle/vm/models/node.py

@@ -246,6 +246,7 @@ class Node(OperatedMixin, TimeStampedModel):
                 return default
                 return default
 
 
     @node_available
     @node_available
+    @method_cache(10)
     def get_monitor_info(self):
     def get_monitor_info(self):
         try:
         try:
             handler = GraphiteHandler()
             handler = GraphiteHandler()
@@ -269,7 +270,7 @@ class Node(OperatedMixin, TimeStampedModel):
         for metric in metrics:
         for metric in metrics:
             response = handler.pop()
             response = handler.pop()
             try:
             try:
-                cache = response[0]["datapoints"][-1][0]
+                cache = response[0]["datapoints"][-2][0]
             except (IndexError, KeyError):
             except (IndexError, KeyError):
                 cache = 0
                 cache = 0
             if cache is None:
             if cache is None: