diff --git a/main/views.py b/main/views.py index 1ef0766..01049e3 100755 --- a/main/views.py +++ b/main/views.py @@ -177,6 +177,22 @@ def get_mem(): data = str(err) return data + +def get_cpu_usage(): + try: + pipe = os.popen("ps aux |" + "awk {'sum+=$3;print sum'} |" + "tail -n 1") + data = pipe.read().strip() + pipe.close() + + cpu_free = (100 - float(data)) + cpu_used = {'free': cpu_free, 'used': float(data)} + data = cpu_used + + except Exception,err: + data = str(err) + + return data + def get_load(): try: diff --git a/pydash/urls.py b/pydash/urls.py index 3bce43c..7baa2f2 100644 --- a/pydash/urls.py +++ b/pydash/urls.py @@ -17,6 +17,7 @@ urlpatterns = patterns('', url(r'^info/uptime/$', 'usage.views.uptime', name='uptime'), url(r'^info/memory/$', 'usage.views.memusage', name='memusage'), url(r'^info/users/$', 'usage.views.getusers', name='getusers'), + url(r'^info/cpuusage/$', 'usage.views.cpuusage', name='cpuusage'), url(r'^info/loadaverage/$', 'usage.views.loadaverage', name='loadaverage') ) diff --git a/templates/main.html b/templates/main.html index 42683b0..7b411a9 100644 --- a/templates/main.html +++ b/templates/main.html @@ -55,7 +55,7 @@