From 4df1591d3c0dfe8bcd27815632023f512e8fee01 Mon Sep 17 00:00:00 2001
From: Gregory Nagy <ngergo@ik.bme.hu>
Date: Wed, 19 Feb 2014 13:23:44 +0100
Subject: [PATCH] fxd
---
src/client.py | 11 +++++------
src/collectables.py | 1 +
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/client.py b/src/client.py
index d7d529e..2d462ec 100644
--- a/src/client.py
+++ b/src/client.py
@@ -180,17 +180,16 @@ class Client:
% (self.name, len(running_vms), time.time()))
for vm in running_vms:
vm_proc = psutil.Process(vm[1])
- if ((self.beat % self.kvmCPU) is 0) and vm_proc.is_running():
+ if (((self.beat % self.kvmCPU) is 0) and vm_proc.is_running()):
+ mem_perc = vm_proc.get_memory_percent() / 100 * vm[2]
metrics.append("vm.%s.memory.usage %f %d"
- % (vm[0],
- vm_proc.get_memory_percent() / 100 * vm[2]),
- time.time())
- if ((self.beat % self.kvmMem) is 0) and vm_proc.is_running():
+ % (vm[0], mem_perc, time.time()))
+ if (((self.beat % self.kvmMem) is 0) and vm_proc.is_running()):
systemtime = vm_proc.get_cpu_times().system
usertime = vm_proc.get_cpu_times().user
sumCpu = systemtime + usertime
metrics.append("vm.%s.cpu.usage %f %d"
- % (sumCpu, time.time()))
+ % (vm[0], sumCpu, time.time()))
interfaces_list = psutil.network_io_counters(
pernic=True)
if ((self.beat % self.kvmNet) is 0):
diff --git a/src/collectables.py b/src/collectables.py
index f47669d..f39d983 100644
--- a/src/collectables.py
+++ b/src/collectables.py
@@ -4,6 +4,7 @@ from metrics import std
class collectables:
__collectables = {
std.cpu.usage.name: [std.cpu.usage],
+ std.cpu.times.name: [std.cpu.times],
std.memory.usage.name: [std.memory.usage],
std.swap.usage.name: [std.swap.usage],
std.user.count.name: [std.user.count],
--
libgit2 0.26.0