dan
/
System-Monitoring-Daemon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'rob/master' 

Conflicts:
	sensors/cpu.py
	sensors/memory.py
This commit is contained in:
Dan Ballard 2012-04-07 21:27:59 -07:00
parent 2f21356a9e c5134d1b21
commit 95cf039d0e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor.py
View File

@ -53,7 +53,7 @@ class Stats():
for s in self.sensors: for s in self.sensors:
s.update() s.update()
self.release_write() self.release_write()
time.sleep(1) time.sleep(0.1)
def getStats(self): def getStats(self):
data = [] data = []

2
sensors/psutil_sensors/cpu.py
View File

@ -36,6 +36,6 @@ class cpu_monitor:
def getFormatedData(self): def getFormatedData(self):
data = '{"name": "Usage", "values": ['+','.join('{"value": %.1f}'%x for x in self.cpu_usage)+']}' data = '{"name": "Usage", "values": ['+','.join('{"value": %.1f}'%x for x in self.cpu_usage)+']}'
data += ',{"name": "Times", "values": [{"name": "user", "value": %.2f},{"name": "system", "value": %.2f},{"name": "idle", "value": %.2f},{"name":"nice", "value": %.2f},{"name": "iowait", "value": %.2f},{"name": "irq", "value": %.2f},{"name": "softirq", "value": %.2f}]}' % (self.cpu_times.user, self.cpu_times.system, self.cpu_times.idle, self.cpu_times.nice, self.cpu_times.iowait, self.cpu_times.irq, self.cpu_times.softirq) data += ',{"name": "Times", "values": [{"name": "user", "value": %.2f},{"name": "system", "value": %.2f},{"name": "idle", "value": %.2f},{"name":"nice", "value": %.2f},{"name": "iowait", "value": %.2f},{"name": "irq", "value": %.2f},{"name": "softirq", "value": %.2f}]}' % (self.cpu_times.user, self.cpu_times.system, self.cpu_times.idle, self.cpu_times.nice, self.cpu_times.iowait, self.cpu_times.irq, self.cpu_times.softirq)
message = '{"type": "Cpu", "value": "%.1f", "data": [%s]}' % ( sum(self.cpu_usage)/self.num_cpus, data ) message = '{"type": "Cpu", "value": %.1f, "data": [%s]}' % ( sum(self.cpu_usage)/self.num_cpus, data )
return message return message

2
sensors/psutil_sensors/memory.py
View File

@ -36,7 +36,7 @@ class mem_monitor:
self.virt_mem_usage = psutil.virtmem_usage() self.virt_mem_usage = psutil.virtmem_usage()
def getFormatedData(self): def getFormatedData(self):
message = '{"type": "Memory", "value": "%.1f", "data": [{"name": "Physical", "value": "%.1f"},{"name": "Virtual", "value": "%.1f"}]}' % (self.mem_usage.percent, self.mem_usage.percent, self.virt_mem_usage.percent) message = '{"type": "Memory", "value": %.1f, "data": [{"name": "Physical", "value": "%.1f"},{"name": "Virtual", "value": "%.1f"}]}' % (self.mem_usage.percent, self.mem_usage.percent, self.virt_mem_usage.percent)
return message return message