Dan Ballard
4630be0b83
More data gathered and new data structure structure
...
- memory returns more data now
- both sensors have had their data reordered and the CPU sensor now returns data for all cpus
- sensors now return a dict with named sub dicts
- monitor.py merges and converts it all to json with built in python json
2012-04-10 23:49:33 -07:00
Dan Ballard
95cf039d0e
Merge remote branch 'rob/master'
...
Conflicts:
sensors/cpu.py
sensors/memory.py
2012-04-07 21:27:59 -07:00
c5134d1b21
Minor fixes in json encoding. Increased polling speed
2012-04-07 21:11:52 -07:00
Dan Ballard
523e57e238
modularize and make loading psutil dependant code check if psutil is tehre first. Add more license boilerplate
2012-04-07 20:36:32 -07:00
Dan Ballard
63c8706039
Merge branch 'master' of https://github.com/rhausch/System-Monitoring-Daemon
...
Conflicts:
monitor.py
2012-04-07 17:53:47 -07:00
17cadcd440
Now with valid JSON format :D
2012-04-07 17:46:42 -07:00
Dan Ballard
568743ff3a
threaded and locked the stats read and write
2012-04-07 17:37:15 -07:00
Dan Ballard
367941070a
Merge branch 'master' of https://github.com/rhausch/System-Monitoring-Daemon
2012-04-07 17:05:37 -07:00
aaad5f5837
Added Memory monitor
2012-04-07 17:04:36 -07:00
Dan Ballard
649b56390b
Merge branch 'master' of https://github.com/rhausch/System-Monitoring-Daemon
...
Conflicts:
monitor.py
2012-04-07 16:50:16 -07:00
2ec58e6d51
Added CPU usage
2012-04-07 16:47:30 -07:00
Dan Ballard
21f62fd994
stats locking
2012-04-07 16:43:54 -07:00
Dan Ballard
e51a76116e
basic server sits on port and listens and spits out canned json message
2012-04-07 16:01:28 -07:00
Dan Ballard
Robert Hausch