diff --git a/web/templates/monitor/status.html b/web/templates/monitor/status.html index cd6c5dc..452a2b9 100644 --- a/web/templates/monitor/status.html +++ b/web/templates/monitor/status.html @@ -35,7 +35,7 @@ CPU Memory Disk - Network + Vnode Image Idletime @@ -49,7 +49,7 @@ {% endif %} {{ quotainfo['memory'] }} MB {{ quotainfo['disk'] }} MB - {{ quotainfo['network'] }} IP addresses + {{ quotainfo['vnode'] }} {{ quotainfo['image'] }} {{ quotainfo['idletime'] }} hours diff --git a/web/webViews/monitor.py b/web/webViews/monitor.py index acc2330..c65a7c1 100755 --- a/web/webViews/monitor.py +++ b/web/webViews/monitor.py @@ -15,7 +15,7 @@ class statusView(normalView): clusters = result.get('clusters') result = dockletRequest.post('/monitor/user/quotainfo/', data) quotainfo = result.get('quotainfo') - quotainfo['cpu'] = int(int(quotainfo['cpu'])/100000) + quotainfo['cpu'] = int(int(quotainfo['cpu'])) print(quotainfo) if (result): containers = {}