mirror/glances
1
0
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2026-03-16 04:52:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin load, mem

Browse Source
This commit is contained in:
Sylvain MOUQUET
2015-01-18 14:40:43 +01:00
parent 80638434a4
commit 596800a99c
4 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
glances/outputs/bottle/index.html
View File

@@ -23,10 +23,12 @@
<div class="col-sm-12">
<div class="pull-left">
<section id="system" class="plugin">
<span class="title">Refresh time&nbsp;</span> <span class="hidden-xs hidden-sm">{{refreshTime}}s
<!--<span class="title">Refresh time&nbsp;</span> <span class="hidden-xs hidden-sm">{{refreshTime}}s
<button ng-click="refreshTime = refreshTime - 1" ng-disabled="refreshTime <= 1">-</button>
<button ng-click="refreshTime = refreshTime + 1">+</button>
</span> <span class="title">{{result["system"].hostname}}&nbsp;</span> <span class="hidden-xs hidden-sm">({{result["system"].os_name}} {{result["system"].os_version}} {{result["system"].platform}})</span>
</span>
-->
<span class="title">{{result["system"].hostname}}&nbsp;</span> <span class="hidden-xs hidden-sm">({{result["system"].os_name}} {{result["system"].os_version}} {{result["system"].platform}})</span>
</section>
</div>
<div class="pull-right">
@@ -38,7 +40,7 @@
</div>
<div class="row">
<div class="col-sm-3">
<div class="col-sm-3 col-lg-2">
<section id="cpu" class="plugin">
<div class="table">
<div class="table-row">
@@ -64,8 +66,65 @@
</div>
</section>
</div>
<div class="col-sm-3 col-lg-2 col-lg-offset-1"></div>
<div class="col-sm-3 col-lg-3">
<div class="col-sm-3 col-lg-2">
<section id="cpu_more" class="plugin">
<div class="table">
<div class="table-row">
<div class="table-cell text-left">nice:</div>
<div class="table-cell">
{{result["cpu"].nice}}%
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">irq:</div>
<div class="table-cell">
{{result["cpu"].irq}}%
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">iowait:</div>
<div class="table-cell" ng-class="getClass('cpu', 'cpu_iowait_', result['cpu'].iowait, 1)">
{{result["cpu"].iowait}}%
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">steal:</div>
<div class="table-cell" ng-class="getClass('cpu', 'cpu_steal_', result['cpu'].steal, 0)">
{{result["cpu"].steal}}%
</div>
</div>
</div>
</section>
</div>
<div class="col-sm-3 col-lg-2"><!-- col-lg-2 col-lg-offset-1 -->
<section id="loading" class="plugin">
<div class="table">
<div class="table-row">
<div class="table-cell text-left title">LOAD</div>
<div class="table-cell">{{result["load"].cpucore}}-core</div>
</div>
<div class="table-row">
<div class="table-cell text-left">1 min:</div>
<div class="table-cell">
{{result["load"].min1}}
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">5 min:</div>
<div class="table-cell" ng-class="getClass('load', 'load_', result['load'].min5, 0)">
{{result["load"].min5}}
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">15 min:</div>
<div class="table-cell" ng-class="getClass('load', 'load_', result['load'].min15, 1)">
{{result["load"].min15}}
</div>
</div>
</div>
</section>
</div>
<div class="col-sm-3 col-lg-2">
<section id="mem" class="plugin">
<div class="table">
<div class="table-row">
@@ -89,7 +148,29 @@
</div>
</section>
</div>
<div class="col-sm-3 col-lg-2 col-lg-offset-1">
<div class="col-sm-3 col-lg-2">
<section id="mem_more" class="plugin">
<div class="table">
<div class="table-row">
<div class="table-cell text-left">active:</div>
<div class="table-cell">{{result["mem"].active | bytes:2}}</div>
</div>
<div class="table-row">
<div class="table-cell text-left">inactive:</div>
<div class="table-cell">{{result["mem"].inactive | bytes:2}}</div>
</div>
<div class="table-row">
<div class="table-cell text-left">buffers:</div>
<div class="table-cell">{{result["mem"].buffers | bytes:2}}</div>
</div>
<div class="table-row">
<div class="table-cell text-left">cached:</div>
<div class="table-cell">{{result["mem"].cached | bytes:2}}</div>
</div>
</div>
</section>
</div>
<div class="col-sm-3 col-lg-2 ">
<section id="memswap" class="plugin">
<div class="table">
<div class="table-row">
@@ -115,7 +196,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-3">
<div class="col-sm-3" ng-show="show.sidebar">
<section id="network" class="plugin" ng-show="show.network">
<div class="table">
<div class="table-row">
@@ -177,6 +258,9 @@
</section>
</div>
<div class="col-sm-9">
<section id="containers" class="plugin">
<span class="title">CONTAINERS</span> 1 (served by Docker 1.2.0)
</section>
<section id="alert" class="plugin" ng-show="show.alert">
<div class="table">
<div class="table-row">
@@ -231,4 +315,4 @@
</div>
</div>
</body>
</html>
</html>

12
glances/outputs/glances_bottle.py
View File

@@ -154,14 +154,8 @@ class GlancesBottle(object):
path = "D:\\glances\\"
filepath = path + "debug.json"
if os.path.exists(filepath):
logger.debug("File exists : {0}.".format(filepath))
f = open(path + "debug.json")
return f.read()
logger.warn("File does not exist : {0}.".format(filepath))
return ""
f = open("/home/sylvain/glances/debug.json")
return f.read()
def _api(self, plugin):
"""
@@ -264,4 +258,4 @@ class GlancesBottle(object):
path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bottle", "index.html")
f = open(path)
return f.read()
return f.read()

4
glances/outputs/static/js/controllers.js
View File

@@ -253,7 +253,7 @@ glancesApp.controller('bodyController', [ '$scope', '$http', '$interval', '$q',
$scope.showHide('network')
} else if ($event.keyCode == keycodes.s) {//s Show/hide sensors stats
$scope.showHide('sensors')
} else if ($event.keyCode == keycodes.TWO) {//2 Show/hide left sidebar
} else if ($event.keyCode == keycodes.TWO && $event.shiftKey) {//2 Show/hide left sidebar
$scope.showHide('sidebar')
} else if ($event.keyCode == keycodes.z) {//z Enable/disable processes stats
//$scope.enableDisable('processStats')
@@ -289,4 +289,4 @@ glancesApp.controller('bodyController', [ '$scope', '$http', '$interval', '$q',
//$scope.sortBy('')
}
}
} ]);
} ]);

4
glances/outputs/static/js/variables.js
View File

@@ -9,7 +9,7 @@ var keycodes = {
'f' : '70',
'n' : '78',
's' : '83',
'TWO' : '98',
'TWO' : '50',
'z' : '90',
'e' : '69',
'SLASH' : '191',
@@ -26,4 +26,4 @@ var keycodes = {
'g' : '',
'r' : '',
'q' : ''
}
}