vm: rename node.cpu.percent

circle/vm/models/node.py

@@ -259,7 +259,7 @@ class Node(OperatedMixin, TimeStampedModel):
     @node_available
     @node_available
     @method_cache(10)
     @method_cache(10)
     def monitor_info(self):
     def monitor_info(self):
-        metrics = ('cpu.usage', 'memory.usage')
+        metrics = ('cpu.percent', 'memory.usage')
         prefix = 'circle.%s.' % self.host.hostname
         prefix = 'circle.%s.' % self.host.hostname
         params = [('target', '%s%s' % (prefix, metric))
         params = [('target', '%s%s' % (prefix, metric))
                   for metric in metrics]
                   for metric in metrics]
@@ -295,7 +295,7 @@ class Node(OperatedMixin, TimeStampedModel):
     @property
     @property
     @node_available
     @node_available
     def cpu_usage(self):
     def cpu_usage(self):
-        return self.monitor_info.get('cpu.usage') / 100
+        return self.monitor_info.get('cpu.percent') / 100
 
 
     @property
     @property
     @node_available
     @node_available