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

Merge branch 'master' of https://github.com/rhausch/System-Monitoring-Daemon 

Conflicts:
	monitor.py
This commit is contained in:
Dan Ballard 2012-04-07 17:53:47 -07:00
parent 568743ff3a 17cadcd440
commit 63c8706039
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monitor.py
View File

@ -55,14 +55,14 @@ class Stats():
self.release_write() self.release_write()
time.sleep(1) time.sleep(1)
def getStats(self): def getStats(self):
message = '' data = []
self.acquire_read()
for s in self.sensors: for s in self.sensors:
self.acquire_read() data.append(s.getFormatedData())
message += '{'+s.getFormatedData()+'}' message = '{"Stats":['+','.join('%s'%x for x in data)+']}'
self.release_read()
self.release_read()
return message return message
def acquire_read(self): def acquire_read(self):

8
sensors/cpu.py
View File

@ -11,10 +11,8 @@ class cpu_monitor:
self.cpu_times = psutil.cpu_times() self.cpu_times = psutil.cpu_times()
def getFormatedData(self): def getFormatedData(self):
message = '' data = '{"name": "Usage", "values": ['+','.join('{"value": %.1f}'%x for x in self.cpu_usage)+']}'
message += '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)
message += ', '.join('%.1f'%x for x in self.cpu_usage) message = '{"type": "Cpu", "value": "%.1f", "data": [%s]}' % ( sum(self.cpu_usage)/self.num_cpus, data )
message += ' CPU times: '
message += ', '.join('%.3f'%x for x in self.cpu_times)
return message return message

2
sensors/memory.py
View File

@ -12,7 +12,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 = 'Memory- Phys: %.1f Virt: %.1f' % (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